Skip to content

Commit fbd5460

Browse files
sdelanoSeth Falcon
authored andcommitted
sanitize whitespace and update license year
1 parent 8c70590 commit fbd5460

15 files changed

Lines changed: 41 additions & 41 deletions

chef-server-api/app/controllers/environments.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2008 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@ class Environments < Application
2424

2525
before :authenticate_every
2626
before :is_admin, :only => [ :create, :update, :destroy ]
27-
27+
2828
# GET /environments
2929
def index
3030
environment_list = Chef::Environment.cdb_list(true)
@@ -45,11 +45,11 @@ def show
4545
# POST /environments
4646
def create
4747
env = params["inflated_object"]
48-
exists = true
48+
exists = true
4949
begin
5050
Chef::Environment.cdb_load(env.name)
5151
rescue Chef::Exceptions::CouchDBNotFound
52-
exists = false
52+
exists = false
5353
end
5454
raise Conflict, "Environment already exists" if exists
5555

@@ -65,7 +65,7 @@ def update
6565
rescue Chef::Exceptions::CouchDBNotFound
6666
raise NotFound, "Cannot load environment #{params[:id]}"
6767
end
68-
68+
6969
env.description(params["inflated_object"].description)
7070
env.cdb_save
7171
env.couchdb_rev = nil

chef/lib/chef/environment.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2008 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/lib/chef/knife/environment_create.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2009 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/lib/chef/knife/environment_delete.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2009 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/lib/chef/knife/environment_edit.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2009 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/lib/chef/knife/environment_list.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2009 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/lib/chef/knife/environment_show.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#
22
# Author:: Stephen Delano (<stephen@opscode.com>)
3-
# Copyright:: Copyright (c) 2009 Opscode, Inc.
3+
# Copyright:: Copyright (c) 2010 Opscode, Inc.
44
# License:: Apache License, Version 2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,15 +26,15 @@ class EnvironmentShow < Knife
2626

2727
banner "knife environment show ENVIRONMENT (options)"
2828

29-
def run
29+
def run
3030
env_name = @name_args[0]
3131

3232
if env_name.nil?
3333
show_usage
3434
Chef::Log.fatal("You must specify an environment name")
3535
exit 1
3636
end
37-
37+
3838
env = Chef::Environment.load(env_name)
3939
output(format_for_display(env))
4040
end
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
22
# Sample Chef Config File
3-
#
3+
#
44

55
environment "production"

chef/spec/unit/environment_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef/spec/unit/knife/environment_create_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
88
# You may obtain a copy of the License at
9-
#
9+
#
1010
# http://www.apache.org/licenses/LICENSE-2.0
11-
#
11+
#
1212
# Unless required by applicable law or agreed to in writing, software
1313
# distributed under the License is distributed on an "AS IS" BASIS,
1414
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

0 commit comments

Comments
 (0)