Repository: accumulo
Updated Branches:
  refs/heads/ACCUMULO-4647 8b6e8330c -> 32eaf3545


ACCUMULO-4647 - changes from review comments


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32eaf354
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32eaf354
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32eaf354

Branch: refs/heads/ACCUMULO-4647
Commit: 32eaf35457f34fc450c3be74c15e96b967b27e39
Parents: 8b6e833
Author: Dave Marion <dlmar...@apache.org>
Authored: Tue Jun 6 11:01:48 2017 -0400
Committer: Dave Marion <dlmar...@apache.org>
Committed: Tue Jun 6 11:01:48 2017 -0400

----------------------------------------------------------------------
 CONTRIBUTING.md | 30 ++++++++++++++++++++++++------
 pom.xml         |  1 -
 2 files changed, 24 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/32eaf354/CONTRIBUTING.md
----------------------------------------------------------------------
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b32729e..fd4d7e6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,23 +1,41 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
 # Contributors Guide
 
- If you believe that you have found a bug, please search for an existing 
[issue](https://issues.apache.org/jira/browse/accumulo) to see if it has 
already been reported. If you would like to add a new feature to Accumulo, 
please send an email with your idea to the 
[user](mailto:u...@accumulo.apache.org) mail list. If it's appropriate, then we 
will create a ticket and assign it to you.
+ If you believe that you have found a bug, please search for an existing 
[issue](https://issues.apache.org/jira/browse/accumulo) to see if it has 
already been reported. If you would like to add a new feature to Accumulo, 
please send an email with your idea to the 
[dev](mailto:d...@accumulo.apache.org) mail list. If it's appropriate, then we 
will create a ticket and assign it to you.
 
 ## Development
 
+- See the [Developer's Guide](https://accumulo.apache.org/contributor/source) 
for information regarding common build commands, IDE setup and more.
 - Ensure that your work targets the correct branch
 - Add / update unit and integration tests
-- Ensure that Accumulo builds cleanly using the command: `mvn clean verify`
 
 ## Patch Submission
 
-- Before submission please squash your commits using a message that contains 
the JIRA issue number and a description of the changes.
+- Ensure that Accumulo builds cleanly before submiting your patch using the 
command: `mvn clean verify`
+- Before submission please squash your commits using a message that starts 
with the JIRA issue number and a description of the changes.
 - Patches should be submitted in the form of Pull Requests to the Apache 
Accumulo GitHub [repository](https://github.com/apache/accumulo/) or to the 
[Review Board](https://reviews.apache.org) accumulo repository.
 
 ## Review
 
-- One or more committers will review your patch. 
-- They will be looking for things like threading issues, performance 
implications, API design, etc.
-- Reviewers will likely ask questions to better understand your change - be 
prepared to answer them.
+- While everyone is welcome to review patches, at least one committer needs to 
review and approve your patch.
+- Reviewers will be looking for things like threading issues, performance 
implications, API design, etc.
+- Reviewers will likely ask questions to better understand your change.
 - Reviewers will make comments about changes to your patch:
     - MUST means that the change is required
     - SHOULD means that the change is suggested, further discussion on the 
subject may be required

http://git-wip-us.apache.org/repos/asf/accumulo/blob/32eaf354/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f4c067e..69b4e77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -832,7 +832,6 @@
               <exclude>nbproject/**</exclude>
               <exclude>nb-configuration.xml</exclude>
               <exclude>nbactions.xml</exclude>
-              <exclude>CONTRIBUTING.md</exclude>
             </excludes>
           </configuration>
         </plugin>

Reply via email to