Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 20b6dba99 -> 8a7f86257


HBASE-14952 ensure correct components in source assembly.

* 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)
(includes ammendment to remove hbase-external-blockcache, since it isn't in 
branch-1.1)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8a7f8625
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8a7f8625
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8a7f8625

Branch: refs/heads/branch-1.1
Commit: 8a7f86257159d387b2326e1af7c0f6dee4b915f0
Parents: 20b6dba
Author: Sean Busbey <[email protected]>
Authored: Tue Dec 8 13:43:48 2015 -0800
Committer: Sean Busbey <[email protected]>
Committed: Wed Dec 16 13:07:55 2015 -0600

----------------------------------------------------------------------
 hbase-assembly/src/main/assembly/src.xml | 2 --
 1 file changed, 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8a7f8625/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..d925965 100644
--- a/hbase-assembly/src/main/assembly/src.xml
+++ b/hbase-assembly/src/main/assembly/src.xml
@@ -47,8 +47,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>

Reply via email to