You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2016/05/18 06:53:11 UTC
[1/2] incubator-guacamole-server git commit: GUACAMOLE-3: Bring
CONTRIBUTING up-to-date with the migration to Apache.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master facc0a794 -> 7e3c28a1c
GUACAMOLE-3: Bring CONTRIBUTING up-to-date with the migration to Apache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/7e2aea57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/7e2aea57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/7e2aea57
Branch: refs/heads/master
Commit: 7e2aea5765e87a80e291046d3e05667b9a0b784d
Parents: facc0a7
Author: Michael Jumper <mj...@apache.org>
Authored: Tue May 17 23:46:52 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue May 17 23:46:52 2016 -0700
----------------------------------------------------------------------
CONTRIBUTING | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/7e2aea57/CONTRIBUTING
----------------------------------------------------------------------
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 713a483..3864b66 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -1,37 +1,39 @@
------------------------------------------------------------
- Contributing to Guacamole
+ Contributing to Apache Guacamole
------------------------------------------------------------
-Thank you for contributing to the Guacamole project!
+Thank you for contributing to the Apache Guacamole project!
There are certain procedures that must be followed for all contributions. These
procedures are necessary to allow us to allocate resources for reviewing and
-testing your contribution, as well as to ensure we have your legal
-authorization to include your contribution in Guacamole.
+testing your contribution, as well as communicate effectively with you during
+the review process.
1) Create an issue in our JIRA
All changes to Guacamole must have corresponding issues in JIRA so the
change can be properly tracked:
- http://glyptodon.org/jira/
+ https://issues.apache.org/jira/browse/GUACAMOLE/
- If you do not already have an account on our JIRA, you will need to create
- one before creating your new issue.
+ If you do not already have an account on the Apache Software Foundation's
+ JIRA, you will need to create one before creating your new issue.
2) Make and test your changes locally
The Guacamole source is maintained in git repositories hosted on GitHub:
- https://github.com/glyptodon/guacamole-client
- https://github.com/glyptodon/guacamole-server
+ https://github.com/apache/incubator-guacamole-client
+ https://github.com/apache/incubator-guacamole-manual
+ https://github.com/apache/incubator-guacamole-server
+ https://github.com/apache/incubator-guacamole-website
To make your changes, fork the applicable repositories and make commits
to a topic branch in your fork. Commits should be made in logical units
and must reference the JIRA issue number:
- $ git commit -m "GUAC-123: Message describing the specific changes made."
+ $ git commit -m "GUACAMOLE-123: High-level message describing the changes."
Avoid commits which cover multiple, distinct goals that could (and should)
be handled separately.
@@ -39,28 +41,12 @@ authorization to include your contribution in Guacamole.
If you do not already have an account on GitHub, you will need to create
one before making your changes.
-3) Sign our Contributor License Agreement (CLA)
-
- All contributors to the Guacamole project must have signed CLAs on file
- before we can merge their contributions:
-
- http://glyptodon.org/cla.html
-
- This is necessary to ensure we have the legal right to include your code
- in our repositories, that we can continue to distribute that code under
- the MIT license, and that you have the legal right to give us that code.
-
- If you create a pull request without first signing the CLA, you will be
- asked to do so before the pull request is reviewed.
-
-4) Submit your changes via a pull request on GitHub
+3) Submit your changes via a pull request on GitHub
Once your changes are ready, submit them by creating a pull request for
the corresponding topic branch you created when you began working on your
changes.
- The Guacamole team will then review your changes and, if they pass review
- and we have your CLA on file, your changes will be allocated to a sprint
- for final testing and merge, and your name will be added to the list of
- contributors for whichever repositories contain your contributions.
+ The Guacamole team will then review your changes and, if they pass review,
+ your changes will be merged.
[2/2] incubator-guacamole-server git commit: Merge updated
contribution guidelines.
Posted by jm...@apache.org.
Merge updated contribution guidelines.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/7e3c28a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/7e3c28a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/7e3c28a1
Branch: refs/heads/master
Commit: 7e3c28a1c26bdae3b797e566113b9914d392ab9b
Parents: facc0a7 7e2aea5
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue May 17 23:52:04 2016 -0700
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue May 17 23:52:04 2016 -0700
----------------------------------------------------------------------
CONTRIBUTING | 44 +++++++++++++++-----------------------------
1 file changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------