Skip to content

Commit 6315871

Browse files
sethvargobtm
authored andcommitted
Normalize whitespace on all files
1 parent 61e98b9 commit 6315871

File tree

399 files changed

+1963
-1967
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+1963
-1967
lines changed

CONTRIBUTING.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ You can find the answers to additional frequently asked questions [on the wiki](
88

99
* Create an account on our [bug tracker](http://tickets.opscode.com)
1010
* Sign our contributor agreement (CLA) [
11-
online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L)
11+
online](https://secure.echosign.com/public/hostedForm?formid=PJIF5694K6L)
1212
(keep reading if you're contributing on behalf of your employer)
1313
* Create a ticket for your change on the [bug tracker](http://tickets.opscode.com)
1414
* Link to your patch as a rebased git branch or pull request from the ticket
@@ -19,7 +19,7 @@ We regularly review contributions and will get back to you if we have any sugges
1919
## The Apache License and the CLA/CCLA
2020

2121
Licensing is very important to open source projects, it helps ensure the software continues to be available under the terms that the author desired.
22-
Chef uses the Apache 2.0 license to strike a balance between open contribution and allowing you to use the software however you would like to.
22+
Chef uses the Apache 2.0 license to strike a balance between open contribution and allowing you to use the software however you would like to.
2323

2424
The license tells you what rights you have that are provided by the copyright holder. It is important that the contributor fully understands what rights
2525
they are licensing and agrees to them. Sometimes the copyright holder isn't the contributor, most often when the contributor is doing work for a company.
@@ -43,26 +43,26 @@ such as:
4343
* Discussion regarding the design and merits of features
4444
* Error output to aid in finding similar bugs
4545

46-
Each ticket should aim to fix one bug or add one feature.
46+
Each ticket should aim to fix one bug or add one feature.
4747

4848
## Using git
4949

50-
You can get a quick copy of the chef repository by running `git clone git://github.com/opscode/chef.git`.
50+
You can get a quick copy of the chef repository by running `git clone git://github.com/opscode/chef.git`.
5151

52-
For collaboration purposes, it is best if you create a Github account and fork the repository to your own account.
52+
For collaboration purposes, it is best if you create a Github account and fork the repository to your own account.
5353
Once you do this you will be able to push your changes to your Github repository for others to see and use.
5454

5555
### Branches and Commits
5656

5757
You should submit your patch as a git branch named after the ticket, such as CHEF-1337.
58-
This is called a _topic branch_ and allows users to associate a branch of code with the ticket.
58+
This is called a _topic branch_ and allows users to associate a branch of code with the ticket.
5959

6060
It is a best practice to have your commit message have a _summary line_ that includes the ticket number,
6161
followed by an empty line and then a brief description of the commit. This also helps other contributors
6262
understand the purpose of changes to the code.
6363

6464
CHEF-3435: Create deploy dirs before calling scm_provider
65-
65+
6666
The SCM providers have an assertation that requires the deploy directory to
6767
exist. The deploy provider will create missing directories, we don't converge
6868
the actions before we call run_action against the SCM provider, so it is not
@@ -76,7 +76,7 @@ helpful to be clear about your use case and change so they can understand it eve
7676

7777
All of Opscode's open source projects are available on [Github](http://www.github.com/opscode).
7878

79-
We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker.
79+
We don't require you to use Github, and we will even take patch diffs attached to tickets on the tracker.
8080
However Github has a lot of convenient features, such as being able to see a diff of changes between a
8181
pull request and the main repository quickly without downloading the branch.
8282

@@ -92,14 +92,14 @@ Additional help with git is available on the [Working with Git](http://wiki.opsc
9292

9393
There are rspec unit tests in the 'spec' directory. If you don't have rspec already installed, you can use the 'bundler'
9494
gem to help you get the necessary prerequisites by running `sudo gem install bundler` and then `bundle install` from
95-
the chef respository. You can run the chef client spec tests by running `rspec spec/*` or `rake spec` from the chef
95+
the chef respository. You can run the chef client spec tests by running `rspec spec/*` or `rake spec` from the chef
9696
directory of the chef repository.
9797

98-
These tests should pass successfully on Ruby 1.8 and 1.9 on all of the platforms that Chef runs on. It is good to run the tests
98+
These tests should pass successfully on Ruby 1.8 and 1.9 on all of the platforms that Chef runs on. It is good to run the tests
9999
once on your system before you get started to ensure they all pass so you have a valid baseline. After you write your patch,
100100
run the tests again to see if they all pass.
101101

102-
If any don't pass, investigate them before submitting your patch.
102+
If any don't pass, investigate them before submitting your patch.
103103

104104
These tests don't modify your system, and sometimes tests fail because a command that would be run has changed because of your
105105
patch. This should be a simple fix. Other times the failure can show you that an important feature no longer works because of
@@ -136,7 +136,7 @@ The versioning for the Chef project is X.Y.Z.
136136

137137
Major releases and have historically been once a year. Minor releases for Chef average every two months and patch releases come as needed.
138138

139-
There are usually beta releases and release candidates (RC) of major and minor releases announced on
139+
There are usually beta releases and release candidates (RC) of major and minor releases announced on
140140
the [chef-dev mailing list](http://lists.opscode.com/sympa/info/chef-dev). Once an RC is released, we wait at least three
141141
days to allow for testing for regressions before the final release. If a blocking regression is found then another RC is made containing
142142
the fix and the timer is reset.

bin/chef-apply

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

bin/chef-client

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

bin/chef-service-manager

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

bin/chef-solo

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

bin/knife

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env ruby
22
#
3-
# ./knife - Chef CLI interface
3+
# ./knife - Chef CLI interface
44
#
55
# Author:: Adam Jacob (<[email protected]>)
66
# Copyright:: Copyright (c) 2009 Opscode, Inc.
@@ -9,9 +9,9 @@
99
# Licensed under the Apache License, Version 2.0 (the "License");
1010
# you may not use this file except in compliance with the License.
1111
# You may obtain a copy of the License at
12-
#
12+
#
1313
# http://www.apache.org/licenses/LICENSE-2.0
14-
#
14+
#
1515
# Unless required by applicable law or agreed to in writing, software
1616
# distributed under the License is distributed on an "AS IS" BASIS,
1717
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

chef.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ Gem::Specification.new do |s|
2929
# CHEF-3027: The knife-cloud plugins require newer features from highline, core chef should not.
3030
s.add_dependency "highline", "~> 1.6", ">= 1.6.9"
3131
s.add_dependency "erubis", "~> 2.7"
32-
3332
s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
34-
33+
3534
%w(rdoc sdoc rake rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem }
3635
%w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.13.0" }
3736
s.add_development_dependency "chef-zero", "~> 1.4"

distro/arch/etc/rc.d/chef-client

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

distro/arch/etc/rc.d/chef-server

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

distro/arch/etc/rc.d/chef-server-webui

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

0 commit comments

Comments
 (0)