Repository: hbase
Updated Branches:
refs/heads/branch-1.2 0e52565d6 -> 58ddbe863
HBASE-14952 ensure correct components in source assembly.
* hbase-external-blockcache
* remove duplicate inclusion of hbase-shaded-{client,server}
Signed-off-by: stack <[email protected]>
(includes ADDENDUM to remove hbase-spark, since it isn't in branch-1.2 yet)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/58ddbe86
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/58ddbe86
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/58ddbe86
Branch: refs/heads/branch-1.2
Commit: 58ddbe863f3023248f2f2d65bf6a13feaf169f26
Parents: 0e52565
Author: Sean Busbey <[email protected]>
Authored: Tue Dec 8 13:43:48 2015 -0800
Committer: Sean Busbey <[email protected]>
Committed: Wed Dec 16 12:57:41 2015 -0600
----------------------------------------------------------------------
hbase-assembly/src/main/assembly/src.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/58ddbe86/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 8858308..16b22ee 100644
--- a/hbase-assembly/src/main/assembly/src.xml
+++ b/hbase-assembly/src/main/assembly/src.xml
@@ -37,6 +37,7 @@
<include>org.apache.hbase:hbase-client</include>
<include>org.apache.hbase:hbase-common</include>
<include>org.apache.hbase:hbase-examples</include>
+ <include>org.apache.hbase:hbase-external-blockcache</include>
<include>org.apache.hbase:hbase-hadoop2-compat</include>
<include>org.apache.hbase:hbase-hadoop-compat</include>
<include>org.apache.hbase:hbase-it</include>
@@ -47,8 +48,6 @@
<include>org.apache.hbase:hbase-resource-bundle</include>
<include>org.apache.hbase:hbase-server</include>
<include>org.apache.hbase:hbase-shaded</include>
- <include>org.apache.hbase:hbase-shaded-client</include>
- <include>org.apache.hbase:hbase-shaded-server</include>
<include>org.apache.hbase:hbase-shell</include>
<include>org.apache.hbase:hbase-testing-util</include>
<include>org.apache.hbase:hbase-thrift</include>
