forked from redhat-openstack/openstack-puppet-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #376 from cmurphy/master
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
- Loading branch information
Showing
2 changed files
with
5 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -41,11 +41,9 @@ Checklist (and a short version for the impatient) | |
|
||
* Pre-requisites: | ||
|
||
- Sign the [Contributor License Agreement](https://cla.puppetlabs.com/) | ||
|
||
- Make sure you have a [GitHub account](https://github.com/join) | ||
|
||
- [Create a ticket](http://projects.puppetlabs.com/projects/modules/issues/new), or [watch the ticket](http://projects.puppetlabs.com/projects/modules/issues) you are patching for. | ||
- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for. | ||
|
||
* Preferred method: | ||
|
||
|
@@ -94,17 +92,7 @@ The long version | |
whitespace or other "whitespace errors". You can do this by | ||
running "git diff --check" on your changes before you commit. | ||
|
||
2. Sign the Contributor License Agreement | ||
|
||
Before we can accept your changes, we do need a signed Puppet | ||
Labs Contributor License Agreement (CLA). | ||
|
||
You can access the CLA via the [Contributor License Agreement link](https://cla.puppetlabs.com/) | ||
|
||
If you have any questions about the CLA, please feel free to | ||
contact Puppet Labs via email at [email protected]. | ||
|
||
3. Sending your patches | ||
2. Sending your patches | ||
|
||
To submit your changes via a GitHub pull request, we _highly_ | ||
recommend that you have them on a topic branch, instead of | ||
|
@@ -124,7 +112,7 @@ The long version | |
in order to open a pull request. | ||
|
||
|
||
4. Update the related GitHub issue. | ||
3. Update the related GitHub issue. | ||
|
||
If there is a GitHub issue associated with the change you | ||
submitted, then you should update the ticket to include the | ||
|
@@ -220,14 +208,12 @@ review. | |
Additional Resources | ||
==================== | ||
|
||
* [Getting additional help](http://projects.puppetlabs.com/projects/puppet/wiki/Getting_Help) | ||
* [Getting additional help](http://puppetlabs.com/community/get-help) | ||
|
||
* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests) | ||
|
||
* [Patchwork](https://patchwork.puppetlabs.com) | ||
|
||
* [Contributor License Agreement](https://projects.puppetlabs.com/contributor_licenses/sign) | ||
|
||
* [General GitHub documentation](http://help.github.com/) | ||
|
||
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/) | ||
|