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/24 07:01:07 UTC
[1/2] hbase git commit: HBASE-14297 Fix a long standing nit with 0.98
source assemblies
Repository: hbase
Updated Branches:
refs/heads/0.98 208763346 -> b27ca794d
HBASE-14297 Fix a long standing nit with 0.98 source assemblies
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fa956515
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa956515
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa956515
Branch: refs/heads/0.98
Commit: fa956515b9aa1a7bdbfa4400403df89a9e9fb8f6
Parents: 2087633
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Aug 24 04:57:28 2015 +0000
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 24 04:57:28 2015 +0000
----------------------------------------------------------------------
hbase-assembly/src/main/assembly/src.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fa956515/hbase-assembly/src/main/assembly/src.xml
----------------------------------------------------------------------
diff --git a/hbase-assembly/src/main/assembly/src.xml b/hbase-assembly/src/main/assembly/src.xml
index b7a21a4..fba4155 100644
--- a/hbase-assembly/src/main/assembly/src.xml
+++ b/hbase-assembly/src/main/assembly/src.xml
@@ -50,11 +50,11 @@
</moduleSets>
<fileSets>
<!--This one is weird. When we assemble src, it'll be default profile which
- at the moment is hadoop1. But we should include the hadoop2 compat module
- too so can build hadoop2 from src -->
+ at the moment is hadoop2. But we should include the hadoop1 compat module
+ too so can build hadoop1 from src -->
<fileSet>
- <directory>${project.basedir}/../hbase-hadoop2-compat</directory>
- <outputDirectory>hbase-hadoop2-compat</outputDirectory>
+ <directory>${project.basedir}/../hbase-hadoop1-compat</directory>
+ <outputDirectory>hbase-hadoop1-compat</outputDirectory>
<fileMode>0644</fileMode>
<directoryMode>0755</directoryMode>
<excludes>
[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/b27ca794
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b27ca794
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b27ca794
Branch: refs/heads/0.98
Commit: b27ca794d1faa04e60c457452834512a89f89f3a
Parents: fa95651
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Aug 24 05:00:23 2015 +0000
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Aug 24 05:00:23 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b27ca794/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3169f8d..49a5163 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -68,6 +68,7 @@ Release 0.98.14 - 8/29/2015
* [HBASE-14250] - branch-1.1 hbase-server test-jar has incorrect LICENSE
* [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
** Improvement
* [HBASE-8642] - [Snapshot] List and delete snapshot by table