You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/08/25 05:22:25 UTC
[1/2] hbase git commit: HBASE-14303 LICENSE and NOTICE files missing
in root dir of Hadoop 1 binary convenience artifact (0.98)
Repository: hbase
Updated Branches:
refs/heads/0.98 b27ca794d -> da8f48472
HBASE-14303 LICENSE and NOTICE files missing in root dir of Hadoop 1 binary convenience artifact (0.98)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c0732ea3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c0732ea3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c0732ea3
Branch: refs/heads/0.98
Commit: c0732ea3efa0dab131cc67b3743495cace04d692
Parents: b27ca79
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Aug 24 20:20:05 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 24 20:20:05 2015 -0700
----------------------------------------------------------------------
.../src/main/assembly/hadoop-one-compat.xml | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c0732ea3/hbase-assembly/src/main/assembly/hadoop-one-compat.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/hadoop-one-compat.xml b/hbase-assembly/src/main/assembly/hadoop-one-compat.xml
index 0f9580a..0532e6d 100644
--- a/hbase-assembly/src/main/assembly/hadoop-one-compat.xml
+++ b/hbase-assembly/src/main/assembly/hadoop-one-compat.xml
@@ -43,4 +43,25 @@
</binaries>
</moduleSet>
</moduleSets>
+ <!-- Include the generated LICENSE and NOTICE files -->
+ <files>
+ <file>
+ <source>${project.build.directory}/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${project.build.directory}/NOTICE.aggregate</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/src/main/resources/META-INF/LEGAL</source>
+ <outputDirectory>.</outputDirectory>
+ <destName>LEGAL</destName>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
</assembly>
[2/2] hbase git commit: Update CHANGES.txt for 0.98.14RC1 again
Posted by ap...@apache.org.
Update CHANGES.txt for 0.98.14RC1 again
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/da8f4847
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/da8f4847
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/da8f4847
Branch: refs/heads/0.98
Commit: da8f484722d762661f3e45e1504cca02dfd323cf
Parents: c0732ea
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Aug 24 20:21:47 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 24 20:21:47 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/da8f4847/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 49a5163..d752a12 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -69,6 +69,7 @@ Release 0.98.14 - 8/29/2015
* [HBASE-14251] - javadoc jars use LICENSE/NOTICE from primary artifact
* [HBASE-14291] - NPE On StochasticLoadBalancer Balance Involving RS With No Regions
* [HBASE-14297] - Fix a long standing nit with 0.98 source assemblies
+ * [HBASE-14303] - LICENSE and NOTICE files missing in root dir of Hadoop 1 binary convenience artifact
** Improvement
* [HBASE-8642] - [Snapshot] List and delete snapshot by table