You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/01/16 20:35:14 UTC
[1/2] hbase git commit: HBASE-19791 TestZKAsyncRegistry hangs
Repository: hbase
Updated Branches:
refs/heads/master 9917244be -> 8b6b2b0b2
HBASE-19791 TestZKAsyncRegistry hangs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d3a306d8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d3a306d8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d3a306d8
Branch: refs/heads/master
Commit: d3a306d81d3f087696fc6d45dd8d6bda939378b2
Parents: 9917244
Author: Michael Stack <st...@apache.org>
Authored: Sat Jan 13 12:40:36 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Jan 16 12:34:05 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d3a306d8/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
index 3478549..a0c4c25 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
@@ -47,6 +47,9 @@ import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * Test the ZooKeeper Async Registry.
+ */
@Category({ MediumTests.class, ClientTests.class })
public class TestZKAsyncRegistry {
private static final Logger LOG = LoggerFactory.getLogger(TestZKAsyncRegistry.class);
[2/2] hbase git commit: HBASE-19739 Include thrift IDL files in
hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively
Posted by st...@apache.org.
HBASE-19739 Include thrift IDL files in hbase-thrift.jar and .proto files in hbase-protocol-shaded.jar respectively
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8b6b2b0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b6b2b0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b6b2b0b
Branch: refs/heads/master
Commit: 8b6b2b0b227f9b16d9c85ab69afa1f968ce72400
Parents: d3a306d
Author: Umesh Agashe <ua...@cloudera.com>
Authored: Wed Jan 10 14:03:30 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Jan 16 12:35:00 2018 -0800
----------------------------------------------------------------------
hbase-protocol-shaded/pom.xml | 8 ++++++++
hbase-thrift/pom.xml | 6 ++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b2b0b/hbase-protocol-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 03030b8..1da0a32 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -38,6 +38,14 @@
<internal.protobuf.version>3.3.0</internal.protobuf.version>
</properties>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/</directory>
+ <includes>
+ <include>**/*.proto</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/8b6b2b0b/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 891676a..7410d99 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -43,6 +43,12 @@
<include>hbase-webapps/**</include>
</includes>
</resource>
+ <resource>
+ <directory>src/main/resources/</directory>
+ <includes>
+ <include>**/*.thrift</include>
+ </includes>
+ </resource>
</resources>
<testResources>
<testResource>