You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/06/30 14:25:26 UTC
[1/2] hbase git commit: HBASE-18288 Declared dependency on specific
javax.ws.rs.
Repository: hbase
Updated Branches:
refs/heads/master 21653c31d -> 3caeba079
HBASE-18288 Declared dependency on specific javax.ws.rs.
Signed-off-by: Huaxiang Sun <hu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/74c57420
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/74c57420
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/74c57420
Branch: refs/heads/master
Commit: 74c574202489824aa7bada7a6d38059e934a3f65
Parents: 21653c3
Author: Sean Busbey <bu...@apache.org>
Authored: Wed Jun 28 16:28:40 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Jun 30 08:41:50 2017 -0500
----------------------------------------------------------------------
hbase-it/pom.xml | 5 +++++
hbase-rest/pom.xml | 4 ++++
hbase-server/pom.xml | 4 ++++
pom.xml | 6 ++++++
4 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/74c57420/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 9bc85c8..a867fbb 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -255,6 +255,11 @@
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
<dependency>
<groupId>io.netty</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/74c57420/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 4c98304..1714b51 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -273,6 +273,10 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/hbase/blob/74c57420/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 2412c3b..c4c6f1d 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -518,6 +518,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
<!-- tracing Dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/hbase/blob/74c57420/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1b87973..adb487b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1367,6 +1367,7 @@
<jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version>
<jackson1.version>1.9.13</jackson1.version>
<servlet.api.version>3.1.0</servlet.api.version>
+ <wx.rs.api.version>2.0.1</wx.rs.api.version>
<jersey.version>2.25.1</jersey.version>
<jetty.jspapi.version>6.1.14</jetty.jspapi.version>
<jruby.version>9.1.10.0</jruby.version>
@@ -1835,6 +1836,11 @@
<version>${servlet.api.version}</version>
</dependency>
<dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>${wx.rs.api.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
[2/2] hbase git commit: HBASE-15391 ADDENDUM Avoid too large "deleted
from META" info log.
Posted by bu...@apache.org.
HBASE-15391 ADDENDUM Avoid too large "deleted from META" info log.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3caeba07
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3caeba07
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3caeba07
Branch: refs/heads/master
Commit: 3caeba07981de09c440284caa5d3d31d686377d6
Parents: 74c5742
Author: Sean Busbey <bu...@apache.org>
Authored: Fri Jun 30 09:15:44 2017 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Jun 30 09:15:44 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3caeba07/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 32f66b3..de79a67 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1977,9 +1977,9 @@ public class MetaTableAccessor {
deletes.add(e);
}
deleteFromMetaTable(connection, deletes);
- LOG.info("Deleted " + regionInfos.size() + " regions from META");
+ LOG.info("Deleted " + regionsInfo.size() + " regions from META");
if (LOG.isDebugEnabled()) {
- LOG.debug("Deleted regions: " + regionInfos);
+ LOG.debug("Deleted regions: " + regionsInfo);
}
}