Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 57aaee5bb -> d7547c615


http://git-wip-us.apache.org/repos/asf/hbase/blob/d7547c61/hbase-assembly/src/main/assembly/components.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/components.xml 
b/hbase-assembly/src/main/assembly/components.xml
index e6c45e0..fe57078 100644
--- a/hbase-assembly/src/main/assembly/components.xml
+++ b/hbase-assembly/src/main/assembly/components.xml
@@ -32,7 +32,8 @@
       <directory>${project.basedir}/..</directory>
       <outputDirectory>.</outputDirectory>
       <includes>
-        <include>CHANGES.txt</include>
+        <include>CHANGES.md</include>
+        <include>RELEASENOTES.md</include>
         <include>README.txt</include>
       </includes>
       <fileMode>0644</fileMode>

http://git-wip-us.apache.org/repos/asf/hbase/blob/d7547c61/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dbe6026..3fe436b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -830,7 +830,6 @@
               <exclude>**/0000000000000016310</exclude>
               <exclude>**/.idea/**</exclude>
               <exclude>**/*.iml</exclude>
-              <exclude>**/CHANGES.txt</exclude>
               <exclude>**/generated/**</exclude>
               <exclude>**/gen-*/**</exclude>
               <!-- No material contents -->

http://git-wip-us.apache.org/repos/asf/hbase/blob/d7547c61/src/main/asciidoc/_chapters/developer.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/_chapters/developer.adoc 
b/src/main/asciidoc/_chapters/developer.adoc
index 6d959c2..4e35fd2 100644
--- a/src/main/asciidoc/_chapters/developer.adoc
+++ b/src/main/asciidoc/_chapters/developer.adoc
@@ -578,8 +578,9 @@ You could also set this in an environment variable or alias 
in your shell.
 The script _dev-support/make_rc.sh_ automates many of the below steps.
 It will checkout a tag, clean the checkout, build src and bin tarballs,
 and deploy the built jars to repository.apache.org.
-It does NOT do the modification of the _CHANGES.txt_ for the release,
-the checking of the produced artifacts to ensure they are 'good' --
+It does NOT do the modification of the _CHANGES.md_ and _RELEASENOTES.md_
+(See HBASE-18828 for how to generate these files)
+for the release, the checking of the produced artifacts to ensure they are 
'good' --
 e.g. extracting the produced tarballs, verifying that they
 look right, then starting HBase and checking that everything is running
 correctly -- or the signing and pushing of the tarballs to
@@ -588,9 +589,9 @@ Take a look. Modify/improve as you see fit.
 ====
 
 .Procedure: Release Procedure
-. Update the _CHANGES.txt_ file and the POM files.
+. Update the _CHANGES.md and _RELEASENOTES.md_ files (See HBASE-18828 for 
how)_ and the POM files.
 +
-Update _CHANGES.txt_ with the changes since the last release.
+Update _CHANGES.md and _RELEASENOTES.md_ with the changes since the last 
release.
 Make sure the URL to the JIRA points to the proper location which lists fixes 
for this release.
 Adjust the version in all the POM files appropriately.
 If you are making a release candidate, you must remove the `-SNAPSHOT` label 
from all versions
@@ -604,7 +605,8 @@ To set a version in all the many poms of the hbase 
multi-module project, use a c
 $ mvn clean org.codehaus.mojo:versions-maven-plugin:2.5:set 
-DnewVersion=2.1.0-SNAPSHOT
 ----
 +
-Make sure all versions in poms are changed! Checkin the _CHANGES.txt_ and any 
maven version changes.
+Make sure all versions in poms are changed! Checkin the _CHANGES.md_ and 
_RELEASENOTES.md_
+and any maven version changes.
 
 . Update the documentation.
 +

Reply via email to