hbase git commit: HBASE-16191 Add stop_regionserver and stop_master to shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 5ac774089 -> aa8ceb816


HBASE-16191 Add stop_regionserver and stop_master to shell

Amending-Author: Peter Somogyi 


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

Branch: refs/heads/branch-2
Commit: aa8ceb81677dccd9b8f26d328a712873ac76245e
Parents: 5ac7740
Author: Enis Soztutar 
Authored: Fri May 11 14:32:13 2018 +0200
Committer: Peter Somogyi 
Committed: Mon May 14 09:38:22 2018 +0200

--
 hbase-shell/src/main/ruby/.rubocop.yml  |  5 +++
 hbase-shell/src/main/ruby/hbase/admin.rb| 10 +
 hbase-shell/src/main/ruby/shell.rb  |  2 +
 .../src/main/ruby/shell/commands/stop_master.rb | 38 +++
 .../ruby/shell/commands/stop_regionserver.rb| 40 
 5 files changed, 95 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/aa8ceb81/hbase-shell/src/main/ruby/.rubocop.yml
--
diff --git a/hbase-shell/src/main/ruby/.rubocop.yml 
b/hbase-shell/src/main/ruby/.rubocop.yml
new file mode 100644
index 000..7b04138
--- /dev/null
+++ b/hbase-shell/src/main/ruby/.rubocop.yml
@@ -0,0 +1,5 @@
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Layout/IndentHeredoc:
+  Enabled: false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hbase/blob/aa8ceb81/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index cb57c4c..c385d3d 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -1309,6 +1309,16 @@ module Hbase
   TableName.valueOf(new_table_name),
   preserve_splits)
 end
+
+# Stop the active Master
+def stop_master
+  @admin.stopMaster
+end
+
+# Stop the given RegionServer
+def stop_regionserver(hostport)
+  @admin.stopRegionServer(hostport)
+end
   end
   # rubocop:enable Metrics/ClassLength
 end

http://git-wip-us.apache.org/repos/asf/hbase/blob/aa8ceb81/hbase-shell/src/main/ruby/shell.rb
--
diff --git a/hbase-shell/src/main/ruby/shell.rb 
b/hbase-shell/src/main/ruby/shell.rb
index ab07a79..9a79658 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -357,6 +357,8 @@ Shell.load_command_group(
 list_deadservers
 clear_deadservers
 clear_block_cache
+stop_master
+stop_regionserver
   ],
   # TODO: remove older hlog_roll command
   aliases: {

http://git-wip-us.apache.org/repos/asf/hbase/blob/aa8ceb81/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/stop_master.rb 
b/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
new file mode 100644
index 000..45a2b11
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
@@ -0,0 +1,38 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shell
+  module Commands
+# Stop active Master
+class StopMaster < Command
+  def help
+<<-EOF
+Stop active Master. For experts only.
+Examples:
+
+  hbase> stop_master
+EOF
+  end
+
+  def command
+admin.stop_master
+  end
+end
+  end
+end

http://git-wip-us.apache.org/repos/asf/hbase/blob/aa8ceb81/hbase-shell/src/main/ruby/shell/commands/stop_regionserver.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/stop_regionserver.rb 

hbase git commit: HBASE-16191 Add stop_regionserver and stop_master to shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master d1cc92599 -> 91756d7f7


HBASE-16191 Add stop_regionserver and stop_master to shell

Amending-Author: Peter Somogyi 


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

Branch: refs/heads/master
Commit: 91756d7f796311269154110ca6967eea32d7bab0
Parents: d1cc925
Author: Enis Soztutar 
Authored: Fri May 11 14:32:13 2018 +0200
Committer: Peter Somogyi 
Committed: Mon May 14 09:36:20 2018 +0200

--
 hbase-shell/src/main/ruby/.rubocop.yml  |  5 +++
 hbase-shell/src/main/ruby/hbase/admin.rb| 10 +
 hbase-shell/src/main/ruby/shell.rb  |  2 +
 .../src/main/ruby/shell/commands/stop_master.rb | 38 +++
 .../ruby/shell/commands/stop_regionserver.rb| 40 
 5 files changed, 95 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/91756d7f/hbase-shell/src/main/ruby/.rubocop.yml
--
diff --git a/hbase-shell/src/main/ruby/.rubocop.yml 
b/hbase-shell/src/main/ruby/.rubocop.yml
new file mode 100644
index 000..7b04138
--- /dev/null
+++ b/hbase-shell/src/main/ruby/.rubocop.yml
@@ -0,0 +1,5 @@
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Layout/IndentHeredoc:
+  Enabled: false
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/hbase/blob/91756d7f/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index cb57c4c..c385d3d 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -1309,6 +1309,16 @@ module Hbase
   TableName.valueOf(new_table_name),
   preserve_splits)
 end
+
+# Stop the active Master
+def stop_master
+  @admin.stopMaster
+end
+
+# Stop the given RegionServer
+def stop_regionserver(hostport)
+  @admin.stopRegionServer(hostport)
+end
   end
   # rubocop:enable Metrics/ClassLength
 end

http://git-wip-us.apache.org/repos/asf/hbase/blob/91756d7f/hbase-shell/src/main/ruby/shell.rb
--
diff --git a/hbase-shell/src/main/ruby/shell.rb 
b/hbase-shell/src/main/ruby/shell.rb
index ab07a79..9a79658 100644
--- a/hbase-shell/src/main/ruby/shell.rb
+++ b/hbase-shell/src/main/ruby/shell.rb
@@ -357,6 +357,8 @@ Shell.load_command_group(
 list_deadservers
 clear_deadservers
 clear_block_cache
+stop_master
+stop_regionserver
   ],
   # TODO: remove older hlog_roll command
   aliases: {

http://git-wip-us.apache.org/repos/asf/hbase/blob/91756d7f/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/stop_master.rb 
b/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
new file mode 100644
index 000..45a2b11
--- /dev/null
+++ b/hbase-shell/src/main/ruby/shell/commands/stop_master.rb
@@ -0,0 +1,38 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Shell
+  module Commands
+# Stop active Master
+class StopMaster < Command
+  def help
+<<-EOF
+Stop active Master. For experts only.
+Examples:
+
+  hbase> stop_master
+EOF
+  end
+
+  def command
+admin.stop_master
+  end
+end
+  end
+end

http://git-wip-us.apache.org/repos/asf/hbase/blob/91756d7f/hbase-shell/src/main/ruby/shell/commands/stop_regionserver.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/stop_regionserver.rb 

hbase git commit: HBASE-20488 Fix PE command help message

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 60bdaf784 -> cf529f18a


HBASE-20488 Fix PE command help message

checkstyle fix

Signed-off-by: Peter Somogyi 


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

Branch: refs/heads/master
Commit: cf529f18a9959589fa635f78df4840472526ea2c
Parents: 60bdaf7
Author: Xu Cang 
Authored: Wed May 16 10:30:21 2018 -0700
Committer: Peter Somogyi 
Committed: Thu May 17 11:56:04 2018 +0200

--
 .../org/apache/hadoop/hbase/PerformanceEvaluation.java | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cf529f18/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
--
diff --git 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
index 33267e0..42acb5c 100644
--- 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -132,6 +132,7 @@ import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFacto
 public class PerformanceEvaluation extends Configured implements Tool {
   static final String RANDOM_SEEK_SCAN = "randomSeekScan";
   static final String RANDOM_READ = "randomRead";
+  static final String PE_COMMAND_SHORTNAME = "pe";
   private static final Logger LOG = 
LoggerFactory.getLogger(PerformanceEvaluation.class.getName());
   private static final ObjectMapper MAPPER = new ObjectMapper();
   static {
@@ -2356,11 +2357,11 @@ public class PerformanceEvaluation extends Configured 
implements Tool {
   }
 
   protected void printUsage() {
-printUsage(this.getClass().getName(), null);
+printUsage(PE_COMMAND_SHORTNAME, null);
   }
 
   protected static void printUsage(final String message) {
-printUsage(PerformanceEvaluation.class.getName(), message);
+printUsage(PE_COMMAND_SHORTNAME, message);
   }
 
   protected static void printUsageAndExit(final String message, final int 
exitCode) {
@@ -2368,11 +2369,11 @@ public class PerformanceEvaluation extends Configured 
implements Tool {
 System.exit(exitCode);
   }
 
-  protected static void printUsage(final String className, final String 
message) {
+  protected static void printUsage(final String shortName, final String 
message) {
 if (message != null && message.length() > 0) {
   System.err.println(message);
 }
-System.err.println("Usage: java " + className + " \\");
+System.err.print("Usage: hbase " + shortName);
 System.err.println("   

hbase git commit: HBASE-20488 Fix PE command help message

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 34c458c12 -> 56bb1fa06


HBASE-20488 Fix PE command help message

checkstyle fix

Signed-off-by: Peter Somogyi 


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

Branch: refs/heads/branch-2
Commit: 56bb1fa06533e4cc86a62dfb6b5c1691f7ac291f
Parents: 34c458c
Author: Xu Cang 
Authored: Wed May 16 10:30:21 2018 -0700
Committer: Peter Somogyi 
Committed: Thu May 17 11:58:23 2018 +0200

--
 .../org/apache/hadoop/hbase/PerformanceEvaluation.java | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/56bb1fa0/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
--
diff --git 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
index b37b255..99940d4 100644
--- 
a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ 
b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -132,6 +132,7 @@ import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFacto
 public class PerformanceEvaluation extends Configured implements Tool {
   static final String RANDOM_SEEK_SCAN = "randomSeekScan";
   static final String RANDOM_READ = "randomRead";
+  static final String PE_COMMAND_SHORTNAME = "pe";
   private static final Logger LOG = 
LoggerFactory.getLogger(PerformanceEvaluation.class.getName());
   private static final ObjectMapper MAPPER = new ObjectMapper();
   static {
@@ -2356,11 +2357,11 @@ public class PerformanceEvaluation extends Configured 
implements Tool {
   }
 
   protected void printUsage() {
-printUsage(this.getClass().getName(), null);
+printUsage(PE_COMMAND_SHORTNAME, null);
   }
 
   protected static void printUsage(final String message) {
-printUsage(PerformanceEvaluation.class.getName(), message);
+printUsage(PE_COMMAND_SHORTNAME, message);
   }
 
   protected static void printUsageAndExit(final String message, final int 
exitCode) {
@@ -2368,11 +2369,11 @@ public class PerformanceEvaluation extends Configured 
implements Tool {
 System.exit(exitCode);
   }
 
-  protected static void printUsage(final String className, final String 
message) {
+  protected static void printUsage(final String shortName, final String 
message) {
 if (message != null && message.length() > 0) {
   System.err.println(message);
 }
-System.err.println("Usage: java " + className + " \\");
+System.err.print("Usage: hbase " + shortName);
 System.err.println("   

hbase git commit: HBASE-19718 Remove PREFIX_TREE from compression.adoc

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 36f3d9432 -> 477f9fdb3


HBASE-19718 Remove PREFIX_TREE from compression.adoc

Signed-off-by: Ted Yu 


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

Branch: refs/heads/master
Commit: 477f9fdb32873387231c5fbbff130ba8bf7b5d68
Parents: 36f3d94
Author: Peter Somogyi 
Authored: Thu May 24 14:35:41 2018 +0200
Committer: Peter Somogyi 
Committed: Fri May 25 15:55:46 2018 +0200

--
 src/main/asciidoc/_chapters/compression.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/477f9fdb/src/main/asciidoc/_chapters/compression.adoc
--
diff --git a/src/main/asciidoc/_chapters/compression.adoc 
b/src/main/asciidoc/_chapters/compression.adoc
index 67d10f5..c89e305 100644
--- a/src/main/asciidoc/_chapters/compression.adoc
+++ b/src/main/asciidoc/_chapters/compression.adoc
@@ -377,7 +377,7 @@ Options:
   LZ4]
  -data_block_encodingEncoding algorithm (e.g. prefix compression) to
   use for data blocks in the test column family, 
one
-  of [NONE, PREFIX, DIFF, FAST_DIFF, PREFIX_TREE].
+  of [NONE, PREFIX, DIFF, FAST_DIFF, ROW_INDEX_V1].
  -encryption Enables transparent encryption on the test table,
   one of [AES]
  -generator  The class which generates load for the tool. Any

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 7eee2f7f0 -> 4b0a87ab8


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-1.4
Commit: 4b0a87ab818df030c19b8591a8bf9bcbe68be71e
Parents: 7eee2f7
Author: Peter Somogyi 
Authored: Sat Jun 9 14:07:50 2018 +0200
Committer: Peter Somogyi 
Committed: Tue Jun 12 08:22:53 2018 +0200

--
 dev-support/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4b0a87ab/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f706e4f..146b5df 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -150,7 +150,7 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc
 RUN apt-add-repository ppa:brightbox/ruby-ng
 RUN apt-get -q update
 
-RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby-switch
+RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby2.2-dev 
ruby-switch
 RUN ruby-switch --set ruby2.2
 
 

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 c596fb6c3 -> 1f3957dda


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-1
Commit: 1f3957dda8b4b0a728beefc6768e84e28f42ca8f
Parents: c596fb6
Author: Peter Somogyi 
Authored: Sat Jun 9 14:07:50 2018 +0200
Committer: Peter Somogyi 
Committed: Tue Jun 12 08:16:19 2018 +0200

--
 dev-support/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1f3957dd/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f706e4f..146b5df 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -150,7 +150,7 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc
 RUN apt-add-repository ppa:brightbox/ruby-ng
 RUN apt-get -q update
 
-RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby-switch
+RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby2.2-dev 
ruby-switch
 RUN ruby-switch --set ruby2.2
 
 

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 4cb2378c1 -> c57ccf7b0


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-1.3
Commit: c57ccf7b0f4f05ce54be31154443a3b3b1684563
Parents: 4cb2378
Author: Peter Somogyi 
Authored: Sat Jun 9 14:07:50 2018 +0200
Committer: Peter Somogyi 
Committed: Tue Jun 12 08:23:59 2018 +0200

--
 dev-support/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c57ccf7b/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f706e4f..146b5df 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -150,7 +150,7 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc
 RUN apt-add-repository ppa:brightbox/ruby-ng
 RUN apt-get -q update
 
-RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby-switch
+RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby2.2-dev 
ruby-switch
 RUN ruby-switch --set ruby2.2
 
 

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 cb6990e0d -> 13ca256b0


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-1.2
Commit: 13ca256b08cdafa9a404976ad08a598c1fde6098
Parents: cb6990e
Author: Peter Somogyi 
Authored: Sat Jun 9 14:07:50 2018 +0200
Committer: Peter Somogyi 
Committed: Tue Jun 12 08:25:06 2018 +0200

--
 dev-support/docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/13ca256b/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index f706e4f..146b5df 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -150,7 +150,7 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc
 RUN apt-add-repository ppa:brightbox/ruby-ng
 RUN apt-get -q update
 
-RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby-switch
+RUN apt-get -q install --no-install-recommends -y ruby2.2 ruby2.2-dev 
ruby-switch
 RUN ruby-switch --set ruby2.2
 
 

hbase git commit: HBASE-20683 Incorrect return value for PreUpgradeValidator

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 7d3750bd9 -> cfd4b7d56


HBASE-20683 Incorrect return value for PreUpgradeValidator

Signed-off-by: Ted Yu 
Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/master
Commit: cfd4b7d5647b3108a595e75dac1a9aba89b697f9
Parents: 7d3750b
Author: Peter Somogyi 
Authored: Tue Jun 5 12:21:27 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 20:03:56 2018 +0200

--
 .../apache/hadoop/hbase/tool/PreUpgradeValidator.java  | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cfd4b7d5/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
index 138af6a..6fe5a92 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -56,12 +56,12 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   private boolean validateDBE;
 
   /**
-   * Check DataBlockEncodings for column families.
+   * Check DataBlockEncodings of column families are compatible.
*
-   * @return DataBlockEncoding compatible with HBase 2
+   * @return number of column families with incompatible DataBlockEncoding
* @throws IOException if a remote or network exception occurs
*/
-  private boolean validateDBE() throws IOException {
+  private int validateDBE() throws IOException {
 int incompatibilities = 0;
 
 LOG.info("Validating Data Block Encodings");
@@ -92,17 +92,16 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   + "upgrade until these encodings are converted to a supported one.", 
incompatibilities);
   LOG.warn("Check 
http://hbase.apache.org/book.html#upgrade2.0.prefix-tree.removed "
   + "for instructions.");
-  return false;
 } else {
   LOG.info("The used Data Block Encodings are compatible with HBase 2.0.");
-  return true;
 }
+return incompatibilities;
   }
 
   @Override
   protected void addOptions() {
 addOptNoArg("all", "Run all pre-upgrade validations");
-addOptNoArg("validateDBE", "Validate DataBlockEncoding are compatible on 
the cluster");
+addOptNoArg("validateDBE", "Validate DataBlockEncodings are compatible");
   }
 
   @Override
@@ -115,7 +114,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 boolean validationFailed = false;
 if (validateDBE || validateAll) {
-  if (validateDBE()) {
+  if (validateDBE() > 0) {
 validationFailed = true;
   }
 }

hbase git commit: HBASE-20683 Incorrect return value for PreUpgradeValidator

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 a56fd069e -> 5e1c9fcd0


HBASE-20683 Incorrect return value for PreUpgradeValidator

Signed-off-by: Ted Yu 
Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/branch-2.0
Commit: 5e1c9fcd08b35647860553c36140f3e1fa2411ee
Parents: a56fd06
Author: Peter Somogyi 
Authored: Tue Jun 5 12:21:27 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 20:04:53 2018 +0200

--
 .../apache/hadoop/hbase/tool/PreUpgradeValidator.java  | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5e1c9fcd/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
index 138af6a..6fe5a92 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -56,12 +56,12 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   private boolean validateDBE;
 
   /**
-   * Check DataBlockEncodings for column families.
+   * Check DataBlockEncodings of column families are compatible.
*
-   * @return DataBlockEncoding compatible with HBase 2
+   * @return number of column families with incompatible DataBlockEncoding
* @throws IOException if a remote or network exception occurs
*/
-  private boolean validateDBE() throws IOException {
+  private int validateDBE() throws IOException {
 int incompatibilities = 0;
 
 LOG.info("Validating Data Block Encodings");
@@ -92,17 +92,16 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   + "upgrade until these encodings are converted to a supported one.", 
incompatibilities);
   LOG.warn("Check 
http://hbase.apache.org/book.html#upgrade2.0.prefix-tree.removed "
   + "for instructions.");
-  return false;
 } else {
   LOG.info("The used Data Block Encodings are compatible with HBase 2.0.");
-  return true;
 }
+return incompatibilities;
   }
 
   @Override
   protected void addOptions() {
 addOptNoArg("all", "Run all pre-upgrade validations");
-addOptNoArg("validateDBE", "Validate DataBlockEncoding are compatible on 
the cluster");
+addOptNoArg("validateDBE", "Validate DataBlockEncodings are compatible");
   }
 
   @Override
@@ -115,7 +114,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 boolean validationFailed = false;
 if (validateDBE || validateAll) {
-  if (validateDBE()) {
+  if (validateDBE() > 0) {
 validationFailed = true;
   }
 }

hbase git commit: HBASE-20683 Incorrect return value for PreUpgradeValidator

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 323eccc65 -> 00289b8ff


HBASE-20683 Incorrect return value for PreUpgradeValidator

Signed-off-by: Ted Yu 
Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/branch-2
Commit: 00289b8ffae3c2904d1ac8fda9ac38f06eaa5484
Parents: 323eccc
Author: Peter Somogyi 
Authored: Tue Jun 5 12:21:27 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 20:04:22 2018 +0200

--
 .../apache/hadoop/hbase/tool/PreUpgradeValidator.java  | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/00289b8f/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
index 138af6a..6fe5a92 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -56,12 +56,12 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   private boolean validateDBE;
 
   /**
-   * Check DataBlockEncodings for column families.
+   * Check DataBlockEncodings of column families are compatible.
*
-   * @return DataBlockEncoding compatible with HBase 2
+   * @return number of column families with incompatible DataBlockEncoding
* @throws IOException if a remote or network exception occurs
*/
-  private boolean validateDBE() throws IOException {
+  private int validateDBE() throws IOException {
 int incompatibilities = 0;
 
 LOG.info("Validating Data Block Encodings");
@@ -92,17 +92,16 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   + "upgrade until these encodings are converted to a supported one.", 
incompatibilities);
   LOG.warn("Check 
http://hbase.apache.org/book.html#upgrade2.0.prefix-tree.removed "
   + "for instructions.");
-  return false;
 } else {
   LOG.info("The used Data Block Encodings are compatible with HBase 2.0.");
-  return true;
 }
+return incompatibilities;
   }
 
   @Override
   protected void addOptions() {
 addOptNoArg("all", "Run all pre-upgrade validations");
-addOptNoArg("validateDBE", "Validate DataBlockEncoding are compatible on 
the cluster");
+addOptNoArg("validateDBE", "Validate DataBlockEncodings are compatible");
   }
 
   @Override
@@ -115,7 +114,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool {
   protected int doWork() throws Exception {
 boolean validationFailed = false;
 if (validateDBE || validateAll) {
-  if (validateDBE()) {
+  if (validateDBE() > 0) {
 validationFailed = true;
   }
 }

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 5e1c9fcd0 -> 6f01af003


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Mike Drob 
Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-2.0
Commit: 6f01af003a8c9321dec022a3648456f5cee543e0
Parents: 5e1c9fc
Author: Peter Somogyi 
Authored: Wed Jun 6 17:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 23:53:15 2018 +0200

--
 dev-support/docker/Dockerfile | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6f01af00/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 0299fd3..cc1efc1 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -27,7 +27,11 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y \
pylint \
python-dateutil \
rsync \
+   make \
+   gcc \
+   libc6-dev \
ruby \
+   ruby-dev \
shellcheck \
wget \
&& \

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 00289b8ff -> 42ca97680


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Mike Drob 
Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-2
Commit: 42ca97680384ad833f9e3376ae671768c20dc38c
Parents: 00289b8
Author: Peter Somogyi 
Authored: Wed Jun 6 17:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 23:51:47 2018 +0200

--
 dev-support/docker/Dockerfile | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/42ca9768/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 0299fd3..cc1efc1 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -27,7 +27,11 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y \
pylint \
python-dateutil \
rsync \
+   make \
+   gcc \
+   libc6-dev \
ruby \
+   ruby-dev \
shellcheck \
wget \
&& \

hbase git commit: HBASE-20689 Docker fails to install rubocop for precommit

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 1413522f6 -> b002b0b8b


HBASE-20689 Docker fails to install rubocop for precommit

Signed-off-by: Mike Drob 
Signed-off-by: Josh Elser 


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

Branch: refs/heads/master
Commit: b002b0b8b0d94658fab2c2904eb2d8730b13b366
Parents: 1413522
Author: Peter Somogyi 
Authored: Wed Jun 6 17:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Jun 6 23:51:07 2018 +0200

--
 dev-support/docker/Dockerfile | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b002b0b8/dev-support/docker/Dockerfile
--
diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 0299fd3..cc1efc1 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -27,7 +27,11 @@ RUN apt-get -q update && apt-get -q install 
--no-install-recommends -y \
pylint \
python-dateutil \
rsync \
+   make \
+   gcc \
+   libc6-dev \
ruby \
+   ruby-dev \
shellcheck \
wget \
&& \

hbase git commit: HBASE-20592 Create a tool to verify tables do not have prefix tree encoding

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 297d52463 -> 512397220


HBASE-20592 Create a tool to verify tables do not have prefix tree encoding

Signed-off-by: Mike Drob 


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

Branch: refs/heads/branch-2.0
Commit: 512397220a9bcf8a8209d53a51dd1ba3056cb63c
Parents: 297d524
Author: Peter Somogyi 
Authored: Fri May 25 15:03:17 2018 +0200
Committer: Peter Somogyi 
Committed: Fri Jun 1 19:23:40 2018 +0200

--
 bin/hbase   |   3 +
 .../hadoop/hbase/tool/PreUpgradeValidator.java  | 129 +++
 .../_chapters/appendix_hfile_format.adoc|   2 +-
 src/main/asciidoc/_chapters/compression.adoc|   2 +-
 src/main/asciidoc/_chapters/ops_mgt.adoc|  22 
 src/main/asciidoc/_chapters/upgrading.adoc  |   4 +
 6 files changed, 160 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/51239722/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 78dbbdd..18f58c9 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -106,6 +106,7 @@ if [ $# = 0 ]; then
   echo "  regionsplitter  Run RegionSplitter tool"
   echo "  rowcounter  Run RowCounter tool"
   echo "  cellcounter Run CellCounter tool"
+  echo "  pre-upgrade Run Pre-Upgrade validator tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -465,6 +466,8 @@ elif [ "$COMMAND" = "rowcounter" ] ; then
   CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
 elif [ "$COMMAND" = "cellcounter" ] ; then
   CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
+elif [ "$COMMAND" = "pre-upgrade" ] ; then
+  CLASS='org.apache.hadoop.hbase.tool.PreUpgradeValidator'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/51239722/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
new file mode 100644
index 000..138af6a
--- /dev/null
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -0,0 +1,129 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.tool;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
+import org.apache.hadoop.hbase.util.AbstractHBaseTool;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
+
+/**
+ * Tool for validating that cluster can be upgraded from HBase 1.x to 2.0
+ * 
+ * Available validations:
+ * 
+ * all: Run all pre-upgrade validations
+ * validateDBE: Check Data Block Encoding for column families
+ * 
+ * 
+ */
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)
+public class PreUpgradeValidator extends AbstractHBaseTool {
+
+  public static final String NAME = "pre-upgrade";
+  private static final Logger LOG = 
LoggerFactory.getLogger(PreUpgradeValidator.class);
+  private static final byte[] DATA_BLOCK_ENCODING = 
Bytes.toBytes("DATA_BLOCK_ENCODING");
+  private boolean validateAll;
+  private boolean validateDBE;
+
+  /**
+   * Check 

hbase git commit: HBASE-20592 Create a tool to verify tables do not have prefix tree encoding

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 26e54e42c -> 53d29d53c


HBASE-20592 Create a tool to verify tables do not have prefix tree encoding

Signed-off-by: Mike Drob 


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

Branch: refs/heads/branch-2
Commit: 53d29d53c4ab17543936ef6385107bad6fe585d8
Parents: 26e54e4
Author: Peter Somogyi 
Authored: Fri May 25 15:03:17 2018 +0200
Committer: Peter Somogyi 
Committed: Fri Jun 1 19:22:49 2018 +0200

--
 bin/hbase   |   3 +
 .../hadoop/hbase/tool/PreUpgradeValidator.java  | 129 +++
 .../_chapters/appendix_hfile_format.adoc|   2 +-
 src/main/asciidoc/_chapters/compression.adoc|   2 +-
 src/main/asciidoc/_chapters/ops_mgt.adoc|  22 
 5 files changed, 156 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/53d29d53/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 78dbbdd..18f58c9 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -106,6 +106,7 @@ if [ $# = 0 ]; then
   echo "  regionsplitter  Run RegionSplitter tool"
   echo "  rowcounter  Run RowCounter tool"
   echo "  cellcounter Run CellCounter tool"
+  echo "  pre-upgrade Run Pre-Upgrade validator tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -465,6 +466,8 @@ elif [ "$COMMAND" = "rowcounter" ] ; then
   CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
 elif [ "$COMMAND" = "cellcounter" ] ; then
   CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
+elif [ "$COMMAND" = "pre-upgrade" ] ; then
+  CLASS='org.apache.hadoop.hbase.tool.PreUpgradeValidator'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/53d29d53/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
new file mode 100644
index 000..138af6a
--- /dev/null
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -0,0 +1,129 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.tool;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.hadoop.hbase.HBaseInterfaceAudience;
+import org.apache.hadoop.hbase.client.Admin;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
+import org.apache.hadoop.hbase.util.AbstractHBaseTool;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
+
+/**
+ * Tool for validating that cluster can be upgraded from HBase 1.x to 2.0
+ * 
+ * Available validations:
+ * 
+ * all: Run all pre-upgrade validations
+ * validateDBE: Check Data Block Encoding for column families
+ * 
+ * 
+ */
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)
+public class PreUpgradeValidator extends AbstractHBaseTool {
+
+  public static final String NAME = "pre-upgrade";
+  private static final Logger LOG = 
LoggerFactory.getLogger(PreUpgradeValidator.class);
+  private static final byte[] DATA_BLOCK_ENCODING = 
Bytes.toBytes("DATA_BLOCK_ENCODING");
+  private boolean validateAll;
+  private boolean validateDBE;
+
+  /**
+   * Check DataBlockEncodings for column families.
+   *
+   * @return 

hbase git commit: Add psomogyi as committer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 8afa49f5d -> 1fd2a276f


Add psomogyi as committer


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

Branch: refs/heads/master
Commit: 1fd2a276f6849107960acfab7a939aa2842fc9c5
Parents: 8afa49f
Author: Peter Somogyi <psomo...@apache.org>
Authored: Thu Feb 22 19:51:59 2018 +0100
Committer: Peter Somogyi <psomo...@apache.org>
Committed: Thu Feb 22 19:54:03 2018 +0100

--
 pom.xml | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1fd2a276/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9b10ba6..19a36a7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -471,6 +471,12 @@
   +8
 
 
+  psomogyi
+  Peter Somogyi
+  psomo...@apache.org
+  +1
+
+
   rajeshbabu
   Rajeshbabu Chintaguntla
   rajeshb...@apache.org

hbase git commit: HBASE-20731: fix incorrect snapshot folders path in documentation

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master df256223d -> c075f33fc


HBASE-20731: fix incorrect snapshot folders path in documentation

Signed-off-by: Peter Somogyi 


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

Branch: refs/heads/master
Commit: c075f33fc72fa0e959845fb0f381fdafffbaf8f0
Parents: df25622
Author: Sahil Aggarwal 
Authored: Sun Jul 29 11:07:48 2018 +0530
Committer: Peter Somogyi 
Committed: Mon Jul 30 11:04:46 2018 +0200

--
 src/main/asciidoc/_chapters/troubleshooting.adoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c075f33f/src/main/asciidoc/_chapters/troubleshooting.adoc
--
diff --git a/src/main/asciidoc/_chapters/troubleshooting.adoc 
b/src/main/asciidoc/_chapters/troubleshooting.adoc
index 0340105..8da3014 100644
--- a/src/main/asciidoc/_chapters/troubleshooting.adoc
+++ b/src/main/asciidoc/_chapters/troubleshooting.adoc
@@ -850,9 +850,9 @@ Snapshots::
   When you create a snapshot, HBase retains everything it needs to recreate 
the table's
   state at that time of the snapshot. This includes deleted cells or expired 
versions.
   For this reason, your snapshot usage pattern should be well-planned, and you 
should
-  prune snapshots that you no longer need. Snapshots are stored in 
`/hbase/.snapshots`,
+  prune snapshots that you no longer need. Snapshots are stored in 
`/hbase/.hbase-snapshot`,
   and archives needed to restore snapshots are stored in
-  `/hbase/.archive/<_tablename_>/<_region_>/<_column_family_>/`.
+  `/hbase/archive/<_tablename_>/<_region_>/<_column_family_>/`.
 
   *Do not* manage snapshots or archives manually via HDFS. HBase provides APIs 
and
   HBase Shell commands for managing them. For more information, see 
<>.

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 f7323881b -> c998e8d5f


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-2.0
Commit: c998e8d5f9ca3013d175ed447116c0734192f36c
Parents: f732388
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 10:59:38 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 5 +++--
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c998e8d5/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 956489a..b5ee4ab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
 Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/c998e8d5/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 3f4963d..4742bd7 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
 Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master d824bace4 -> b037db4e8


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/master
Commit: b037db4e876715a9f11e6730e040833515483f1c
Parents: d824bac
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 10:56:34 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 5 +++--
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b037db4e/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 956489a..b5ee4ab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
 Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/b037db4e/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 3f4963d..4742bd7 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
 Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 d42886f4f -> e80ce3d91


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-2
Commit: e80ce3d91bcb82061663eeda7da3750cce3b1829
Parents: d42886f
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 10:58:52 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 5 +++--
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e80ce3d9/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 956489a..b5ee4ab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
 Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/e80ce3d9/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 3f4963d..4742bd7 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
 Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
-  character. In the same way, tables and namespaces are specified, but 
namespaces are
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 96a029c0f -> 8e51adc73


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-1.3
Commit: 8e51adc7366545009e7bdbde1f4be47eefa68533
Parents: 96a029c
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 11:11:01 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 7 ---
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8e51adc7/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 7880026..4a22004 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 return <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
-Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/8e51adc7/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 4a0d5ff..fbb99eb 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 return <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
-Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 fd43ff465 -> 42879934f


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-1.2
Commit: 42879934f15b72f268e39f4a2b1c623ac4e6a771
Parents: fd43ff4
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 11:11:37 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 7 ---
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/42879934/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 7880026..4a22004 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 return <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
-Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/42879934/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 4a0d5ff..fbb99eb 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 return <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
-Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 38471229f -> 91a17baae


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-1
Commit: 91a17baaed4bd6ba6e1a21120aa1cfcb64c17037
Parents: 3847122
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 11:06:41 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 7 ---
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/91a17baa/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 7880026..4a22004 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 return <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
-Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/91a17baa/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 4a0d5ff..fbb99eb 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 return <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
-Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace syntax) (Csaba Skrabak)

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 d8007bb97 -> b8ff539a8


HBASE-19802 Wrong usage messages on shell commands (grant/revoke namespace 
syntax) (Csaba Skrabak)


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

Branch: refs/heads/branch-1.4
Commit: b8ff539a80ab4c6c8c5499399ef193d2844adba6
Parents: d8007bb
Author: Peter Somogyi 
Authored: Tue Mar 13 10:55:00 2018 +0100
Committer: Peter Somogyi 
Committed: Tue Mar 13 11:10:10 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/grant.rb  | 7 ---
 hbase-shell/src/main/ruby/shell/commands/revoke.rb | 7 ---
 2 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b8ff539a/hbase-shell/src/main/ruby/shell/commands/grant.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/grant.rb 
b/hbase-shell/src/main/ruby/shell/commands/grant.rb
index 7880026..4a22004 100644
--- a/hbase-shell/src/main/ruby/shell/commands/grant.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/grant.rb
@@ -22,13 +22,14 @@ module Shell
   def help
 return <<-EOF
 Grant users specific rights.
-Syntax : grant ,  [, <@namespace> [,  [,  [, ]]]
+Syntax: grant ,  [,  [,  [, 
]]]
+Syntax: grant , , <@namespace>
 
 permissions is either zero or more letters from the set "RWXCA".
 READ('R'), WRITE('W'), EXEC('X'), CREATE('C'), ADMIN('A')
 
-Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users are granted access in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

http://git-wip-us.apache.org/repos/asf/hbase/blob/b8ff539a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/revoke.rb 
b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
index 4a0d5ff..fbb99eb 100644
--- a/hbase-shell/src/main/ruby/shell/commands/revoke.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/revoke.rb
@@ -22,10 +22,11 @@ module Shell
   def help
 return <<-EOF
 Revoke a user's access rights.
-Syntax : revoke  [, <@namespace> [,  [,  [, 

+Syntax: revoke  [,  [,  [, ]]]
+Syntax: revoke , <@namespace>
 
-Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@' 
-  character. In the same way, tables and namespaces are specified, but 
namespaces are 
+Note: Groups and users access are revoked in the same way, but groups are 
prefixed with an '@'
+  character. Tables and namespaces are specified the same way, but 
namespaces are
   prefixed with an '@' character.
 
 For example:

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 7b5af225e -> 6817a7b13


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1
Commit: 6817a7b131e47a96a354438c2c6ad0fbe6878a28
Parents: 7b5af22
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:25:33 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/6817a7b1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1073d16..a376130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 81bf068b2 -> 34ecc75d1


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2.0
Commit: 34ecc75d1669e330c78c3e9b832eca0abf57902d
Parents: 81bf068
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:24:57 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/34ecc75d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7a64d7d..a89ab9b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 7bd39250e -> ac9035db1


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2
Commit: ac9035db199902533c07d80f384ae29c115d3ad5
Parents: 7bd3925
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:23:59 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ac9035db/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0df5dfb..5ca31f8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 233146da4 -> 1c46250be


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.2
Commit: 1c46250bef9ef9be9c255d61bda69ff7792ed551
Parents: 233146d
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:29:01 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1c46250b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5796885..0befa32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -878,7 +878,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 000a84cb4 -> 641c87ddf


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/master
Commit: 641c87ddf93f88758b5db0b5b506ec53dc826a62
Parents: 000a84c
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:23:16 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/641c87dd/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8057fc2..8c84cbc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1038,7 +1038,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 5e85a99b4 -> 267bce059


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.4
Commit: 267bce0590c39570ddb935921e34bda35e3aa44c
Parents: 5e85a99
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:26:11 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/267bce05/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 01be64c..7508fd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: Fixed typo in Required Java Version error message while building HBase

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 f0e574a7b -> 7a9475e6a


Fixed typo in Required Java Version error message while building HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.3
Commit: 7a9475e6ac55bd13fd492014c15d7b0ffb403b2c
Parents: f0e574a
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 08:26:48 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7a9475e6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index eb99179..fedf90c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,7 +868,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/master
Commit: 56508538307f119ecc0147ff167d727b6004bd27
Parents: 7b0a2aa
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:46:46 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/56508538/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8057fc2..8c84cbc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1038,7 +1038,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 6817a7b13 -> 19721046a


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 6817a7b131e47a96a354438c2c6ad0fbe6878a28.


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

Branch: refs/heads/branch-1
Commit: b65231d04dbc565a578ce928e809aa51f5439857
Parents: 6817a7b
Author: Peter Somogyi 
Authored: Wed Mar 14 11:50:20 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:50:20 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b65231d0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a376130..1073d16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1
Commit: 19721046accfd35b2ea3af3558af608a2737c410
Parents: b65231d
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:50:38 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/19721046/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1073d16..a376130 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.4
Commit: 95d16a5ffeb947787a5c1c76a7fb7f3cbf8e63f7
Parents: 37d46fc
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:51:41 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/95d16a5f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 01be64c..7508fd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 4f54a6678 -> 565085383


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 641c87ddf93f88758b5db0b5b506ec53dc826a62.


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

Branch: refs/heads/master
Commit: 7b0a2aa625028526ff637fee1eb535b8aea038b0
Parents: 4f54a66
Author: Peter Somogyi 
Authored: Wed Mar 14 11:44:08 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:44:08 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/7b0a2aa6/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8c84cbc..8057fc2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1038,7 +1038,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2.0
Commit: 548d8f8e01483ac3ed4a115ce08daae9de613b4e
Parents: cbb8694
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:49:51 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/548d8f8e/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7a64d7d..a89ab9b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 34ecc75d1 -> 548d8f8e0


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 34ecc75d1669e330c78c3e9b832eca0abf57902d.


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

Branch: refs/heads/branch-2.0
Commit: cbb86942eda4b65ddfc5ec436c78a04e5dd21631
Parents: 34ecc75
Author: Peter Somogyi 
Authored: Wed Mar 14 11:49:21 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:49:21 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cbb86942/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a89ab9b..7a64d7d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2
Commit: b06aec4450bc96aac4a40eeabecd69fb5ab59d3b
Parents: e501fe1
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:48:43 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b06aec44/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0df5dfb..5ca31f8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 47b227b55 -> b06aec445


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit ac9035db199902533c07d80f384ae29c115d3ad5.


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

Branch: refs/heads/branch-2
Commit: e501fe1a296be8fec0890e7e15414683aa3d933b
Parents: 47b227b
Author: Peter Somogyi 
Authored: Wed Mar 14 11:47:53 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:47:53 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e501fe1a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5ca31f8..0df5dfb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -969,7 +969,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.2
Commit: e4c0c97d43af4d34b15eadd4f4d60733ca85f433
Parents: 14a8698
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:53:17 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e4c0c97d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5796885..0befa32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -878,7 +878,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 1c46250be -> e4c0c97d4


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 1c46250bef9ef9be9c255d61bda69ff7792ed551.


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

Branch: refs/heads/branch-1.2
Commit: 14a869828fe481697d29b2d6e4135e8026039a38
Parents: 1c46250
Author: Peter Somogyi 
Authored: Wed Mar 14 11:53:04 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:53:04 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/14a86982/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0befa32..5796885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -878,7 +878,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 267bce059 -> 95d16a5ff


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 267bce0590c39570ddb935921e34bda35e3aa44c.


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

Branch: refs/heads/branch-1.4
Commit: 37d46fcf85da772a06da29d9add8a0652330f6c5
Parents: 267bce0
Author: Peter Somogyi 
Authored: Wed Mar 14 11:51:27 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:51:27 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/37d46fcf/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7508fd4..01be64c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[2/2] hbase git commit: HBASE-20189 Fixed typo in Required Java Version error message while building HBase

[psomogyi]

HBASE-20189 Fixed typo in Required Java Version error message while building 
HBase

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-1.3
Commit: f17911b150efa5eaa121fe4bc71861a9e451add3
Parents: 022f30c
Author: Sakthi 
Authored: Tue Mar 13 23:40:09 2018 -0700
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:52:28 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f17911b1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index eb99179..fedf90c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,7 +868,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

[1/2] hbase git commit: Revert "Fixed typo in Required Java Version error message while building HBase" - missing jira number

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 7a9475e6a -> f17911b15


Revert "Fixed typo in Required Java Version error message while building HBase" 
- missing jira number

This reverts commit 7a9475e6ac55bd13fd492014c15d7b0ffb403b2c.


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

Branch: refs/heads/branch-1.3
Commit: 022f30ce0dd3dd931f6045c6778e194ef5c41f7a
Parents: 7a9475e
Author: Peter Somogyi 
Authored: Wed Mar 14 11:52:14 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 14 11:52:14 2018 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/022f30ce/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fedf90c..eb99179 100644
--- a/pom.xml
+++ b/pom.xml
@@ -868,7 +868,7 @@
 
   [${java.min.version},)
   Java is out of date.
-  HBase requires at least version ${java.min.version} of the JDK to properly 
build from source.
+  HBase requirs at least version ${java.min.version} of the JDK to properly 
build from source.
   You appear to be using an older version. You can use either "mvn -version" or
   "mvn enforcer:display-info" to verify what version is active.
   See the reference guide on building for more information: 
http://hbase.apache.org/book.html#build

hbase git commit: HBASE-20155 update branch-2 version to 2.1.0-SNAPSHOT

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 25efd37f3 -> 71cc7869d


HBASE-20155 update branch-2 version to 2.1.0-SNAPSHOT

Signed-off-by: Peter Somogyi 


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

Branch: refs/heads/branch-2
Commit: 71cc7869db30a31fcaf0937770957dbc33b2ae37
Parents: 25efd37
Author: Sean Busbey 
Authored: Wed Mar 7 23:34:17 2018 -0600
Committer: Peter Somogyi 
Committed: Thu Mar 8 08:44:30 2018 -0800

--
 hbase-annotations/pom.xml| 2 +-
 hbase-archetypes/hbase-archetype-builder/pom.xml | 2 +-
 hbase-archetypes/hbase-client-project/pom.xml| 2 +-
 hbase-archetypes/hbase-shaded-client-project/pom.xml | 2 +-
 hbase-archetypes/pom.xml | 2 +-
 hbase-assembly/pom.xml   | 2 +-
 hbase-build-configuration/pom.xml| 2 +-
 hbase-build-support/hbase-error-prone/pom.xml| 6 +++---
 hbase-build-support/pom.xml  | 2 +-
 hbase-checkstyle/pom.xml | 4 ++--
 hbase-client/pom.xml | 2 +-
 hbase-common/pom.xml | 2 +-
 hbase-endpoint/pom.xml   | 2 +-
 hbase-examples/pom.xml   | 2 +-
 hbase-external-blockcache/pom.xml| 2 +-
 hbase-hadoop-compat/pom.xml  | 2 +-
 hbase-hadoop2-compat/pom.xml | 2 +-
 hbase-http/pom.xml   | 2 +-
 hbase-it/pom.xml | 2 +-
 hbase-mapreduce/pom.xml  | 2 +-
 hbase-metrics-api/pom.xml| 2 +-
 hbase-metrics/pom.xml| 2 +-
 hbase-procedure/pom.xml  | 2 +-
 hbase-protocol-shaded/pom.xml| 2 +-
 hbase-protocol/pom.xml   | 2 +-
 hbase-replication/pom.xml| 2 +-
 hbase-resource-bundle/pom.xml| 2 +-
 hbase-rest/pom.xml   | 2 +-
 hbase-rsgroup/pom.xml| 2 +-
 hbase-server/pom.xml | 2 +-
 hbase-shaded/hbase-shaded-check-invariants/pom.xml   | 2 +-
 hbase-shaded/hbase-shaded-client/pom.xml | 2 +-
 hbase-shaded/hbase-shaded-mapreduce/pom.xml  | 2 +-
 hbase-shaded/pom.xml | 2 +-
 hbase-shell/pom.xml  | 2 +-
 hbase-testing-util/pom.xml   | 2 +-
 hbase-thrift/pom.xml | 2 +-
 hbase-zookeeper/pom.xml  | 2 +-
 pom.xml  | 2 +-
 39 files changed, 42 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/71cc7869/hbase-annotations/pom.xml
--
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 8b4dd54..88084fe 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-2.0.0-beta-2
+2.1.0-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/71cc7869/hbase-archetypes/hbase-archetype-builder/pom.xml
--
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml 
b/hbase-archetypes/hbase-archetype-builder/pom.xml
index 059d849..fd9779f 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -25,7 +25,7 @@
   
 hbase-archetypes
 org.apache.hbase
-2.0.0-beta-2
+2.1.0-SNAPSHOT
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/71cc7869/hbase-archetypes/hbase-client-project/pom.xml
--
diff --git a/hbase-archetypes/hbase-client-project/pom.xml 
b/hbase-archetypes/hbase-client-project/pom.xml
index 9cc803b..4eccad3 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@@ -26,7 +26,7 @@
   
 hbase-archetypes
 org.apache.hbase
-2.0.0-beta-2
+2.1.0-SNAPSHOT
 ..
   
   hbase-client-project

http://git-wip-us.apache.org/repos/asf/hbase/blob/71cc7869/hbase-archetypes/hbase-shaded-client-project/pom.xml

hbase git commit: HBASE-20200 list_procedures fails in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 24ea9d1e4 -> 5ea0db0b1


HBASE-20200 list_procedures fails in shell

Signed-off-by: Ted Yu 
Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2
Commit: 5ea0db0b1f42978d3941a654e8efeba3cfdfe521
Parents: 24ea9d1
Author: Balazs Meszaros 
Authored: Wed Mar 14 17:31:15 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 15 08:20:24 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/list_procedures.rb | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5ea0db0b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
index 77335b8..68842a0 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
@@ -35,7 +35,6 @@ EOF
 
 list = JSON.parse(admin.list_procedures)
 list.each do |proc|
-  formatter.row([proc])
   submitted_time = Time.at(Integer(proc['submittedTime']) / 1000).to_s
   last_update = Time.at(Integer(proc['lastUpdate']) / 1000).to_s
   formatter.row([proc['procId'], proc['className'], proc['state'],

hbase git commit: HBASE-20200 list_procedures fails in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 82483fad7 -> 31da4d0bc


HBASE-20200 list_procedures fails in shell

Signed-off-by: Ted Yu 
Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/master
Commit: 31da4d0bce69b3a47066a5df675756087ce4dc60
Parents: 82483fa
Author: Balazs Meszaros 
Authored: Wed Mar 14 17:31:15 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 15 08:19:50 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/list_procedures.rb | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/31da4d0b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
index 77335b8..68842a0 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
@@ -35,7 +35,6 @@ EOF
 
 list = JSON.parse(admin.list_procedures)
 list.each do |proc|
-  formatter.row([proc])
   submitted_time = Time.at(Integer(proc['submittedTime']) / 1000).to_s
   last_update = Time.at(Integer(proc['lastUpdate']) / 1000).to_s
   formatter.row([proc['procId'], proc['className'], proc['state'],

hbase git commit: HBASE-20200 list_procedures fails in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 6874e1a7b -> 907ec6775


HBASE-20200 list_procedures fails in shell

Signed-off-by: Ted Yu 
Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/branch-2.0
Commit: 907ec677570d379fdd02216d2ad424e63500bf03
Parents: 6874e1a
Author: Balazs Meszaros 
Authored: Wed Mar 14 17:31:15 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 15 08:21:02 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/list_procedures.rb | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/907ec677/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
index 77335b8..68842a0 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_procedures.rb
@@ -35,7 +35,6 @@ EOF
 
 list = JSON.parse(admin.list_procedures)
 list.each do |proc|
-  formatter.row([proc])
   submitted_time = Time.at(Integer(proc['submittedTime']) / 1000).to_s
   last_update = Time.at(Integer(proc['lastUpdate']) / 1000).to_s
   formatter.row([proc['procId'], proc['className'], proc['state'],

hbase git commit: HBASE-20287 After cluster startup list_regions command fails on disabled table

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 dd94fe9f1 -> d396e4bc0


HBASE-20287 After cluster startup list_regions command fails on disabled table

Add is_enabled check for list_regions command

Signed-off-by: Mike Drob 


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

Branch: refs/heads/branch-2.0
Commit: d396e4bc075df271edf451bf1a24266f25f9aaf6
Parents: dd94fe9
Author: Peter Somogyi 
Authored: Thu Apr 5 12:12:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sat Apr 7 18:12:46 2018 +0200

--
 .../src/main/ruby/shell/commands/list_regions.rb|  2 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb   | 12 
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d396e4bc/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
index bcc0c4a..0ce569c 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
@@ -50,6 +50,8 @@ EOF
   options = { SERVER_NAME => options }
 end
 
+raise "Table #{table_name} must be enabled." unless 
admin.enabled?(table_name)
+
 size_hash = {}
 if cols.nil?
   size_hash = { 'SERVER_NAME' => 12, 'REGION_NAME' => 12, 'START_KEY' 
=> 10, 'END_KEY' => 10, 'SIZE' => 5, 'REQ' => 5, 'LOCALITY' => 10 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d396e4bc/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index 929484c..a27bbc5 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -319,6 +319,18 @@ module Hbase
   admin.truncate_preserve(@create_test_name, 
$TEST_CLUSTER.getConfiguration)
   assert_equal(splits, table(@create_test_name)._get_splits_internal())
 end
+
+
#---
+
+define_test "list_regions should fail for disabled table" do
+  drop_test_table(@create_test_name)
+  admin.create(@create_test_name, 'a')
+  command(:disable, @create_test_name)
+  assert(:is_disabled, @create_test_name)
+  assert_raise(RuntimeError) do
+command(:list_regions, @create_test_name)
+  end
+end
   end
 
   # Simple administration methods tests

hbase git commit: HBASE-20287 After cluster startup list_regions command fails on disabled table

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master adc0e85e8 -> bdc0d3a4c


HBASE-20287 After cluster startup list_regions command fails on disabled table

Add is_enabled check for list_regions command

Signed-off-by: Mike Drob 


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

Branch: refs/heads/master
Commit: bdc0d3a4c612289af8e0472f4ae30b1c39c09c7f
Parents: adc0e85
Author: Peter Somogyi 
Authored: Thu Apr 5 12:12:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sat Apr 7 18:11:29 2018 +0200

--
 .../src/main/ruby/shell/commands/list_regions.rb|  2 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb   | 12 
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc0d3a4/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
index bcc0c4a..0ce569c 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
@@ -50,6 +50,8 @@ EOF
   options = { SERVER_NAME => options }
 end
 
+raise "Table #{table_name} must be enabled." unless 
admin.enabled?(table_name)
+
 size_hash = {}
 if cols.nil?
   size_hash = { 'SERVER_NAME' => 12, 'REGION_NAME' => 12, 'START_KEY' 
=> 10, 'END_KEY' => 10, 'SIZE' => 5, 'REQ' => 5, 'LOCALITY' => 10 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/bdc0d3a4/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index 929484c..a27bbc5 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -319,6 +319,18 @@ module Hbase
   admin.truncate_preserve(@create_test_name, 
$TEST_CLUSTER.getConfiguration)
   assert_equal(splits, table(@create_test_name)._get_splits_internal())
 end
+
+
#---
+
+define_test "list_regions should fail for disabled table" do
+  drop_test_table(@create_test_name)
+  admin.create(@create_test_name, 'a')
+  command(:disable, @create_test_name)
+  assert(:is_disabled, @create_test_name)
+  assert_raise(RuntimeError) do
+command(:list_regions, @create_test_name)
+  end
+end
   end
 
   # Simple administration methods tests

hbase git commit: HBASE-20287 After cluster startup list_regions command fails on disabled table

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 dcc1d9e36 -> 2cfa344ab


HBASE-20287 After cluster startup list_regions command fails on disabled table

Add is_enabled check for list_regions command

Signed-off-by: Mike Drob 


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

Branch: refs/heads/branch-2
Commit: 2cfa344ab15f52441c9cf8f48d6f3cdca565a067
Parents: dcc1d9e
Author: Peter Somogyi 
Authored: Thu Apr 5 12:12:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sat Apr 7 18:12:04 2018 +0200

--
 .../src/main/ruby/shell/commands/list_regions.rb|  2 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb   | 12 
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2cfa344a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
index bcc0c4a..0ce569c 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
@@ -50,6 +50,8 @@ EOF
   options = { SERVER_NAME => options }
 end
 
+raise "Table #{table_name} must be enabled." unless 
admin.enabled?(table_name)
+
 size_hash = {}
 if cols.nil?
   size_hash = { 'SERVER_NAME' => 12, 'REGION_NAME' => 12, 'START_KEY' 
=> 10, 'END_KEY' => 10, 'SIZE' => 5, 'REQ' => 5, 'LOCALITY' => 10 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/2cfa344a/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index 929484c..a27bbc5 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -319,6 +319,18 @@ module Hbase
   admin.truncate_preserve(@create_test_name, 
$TEST_CLUSTER.getConfiguration)
   assert_equal(splits, table(@create_test_name)._get_splits_internal())
 end
+
+
#---
+
+define_test "list_regions should fail for disabled table" do
+  drop_test_table(@create_test_name)
+  admin.create(@create_test_name, 'a')
+  command(:disable, @create_test_name)
+  assert(:is_disabled, @create_test_name)
+  assert_raise(RuntimeError) do
+command(:list_regions, @create_test_name)
+  end
+end
   end
 
   # Simple administration methods tests

hbase git commit: HBASE-20253. Error message is missing for restore_snapshot

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 b3ec5f0ab -> 9320c5d9b


HBASE-20253. Error message is missing for restore_snapshot

Amending Author: Peter Somogyi 


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

Branch: refs/heads/branch-2.0
Commit: 9320c5d9b8edb8b65513a9308d49bf9f91290ace
Parents: b3ec5f0
Author: Gabor Bota 
Authored: Mon Apr 9 14:28:11 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Apr 11 17:26:01 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands.rb   |  3 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb | 37 +++---
 2 files changed, 29 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9320c5d9/hbase-shell/src/main/ruby/shell/commands.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands.rb 
b/hbase-shell/src/main/ruby/shell/commands.rb
index b4a3407..095e438 100644
--- a/hbase-shell/src/main/ruby/shell/commands.rb
+++ b/hbase-shell/src/main/ruby/shell/commands.rb
@@ -117,6 +117,9 @@ module Shell
 if cause.is_a?(org.apache.hadoop.hbase.TableNotEnabledException)
   raise "Table #{args.first} is disabled!"
 end
+if cause.is_a?(org.apache.hadoop.hbase.TableNotDisabledException)
+  raise "Table #{cause.message} should be disabled!"
+end
 if cause.is_a?(org.apache.hadoop.hbase.UnknownRegionException)
   raise "Unknown region #{args.first}!"
 end

http://git-wip-us.apache.org/repos/asf/hbase/blob/9320c5d9/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index a27bbc5..a3bf0f4 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -361,7 +361,7 @@ module Hbase
 end
   end
 
- # Simple administration methods tests
+  # Simple administration methods tests
   class AdminAlterTableTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -582,7 +582,8 @@ module Hbase
 end
   end
 
-# Simple administration methods tests
+  # Simple administration methods tests
+  # rubocop:disable ClassLength
   class AdminSnapshotTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -651,20 +652,33 @@ module Hbase
   end
 end
 
-define_test "Restore snapshot should work" do
-  drop_test_snapshot()
-  restore_table = "test_restore_snapshot_table"
+define_test 'Restore snapshot should work' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
   command(:create, restore_table, 'f1', 'f2')
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   command(:snapshot, restore_table, @create_test_snapshot)
   command(:alter, restore_table, METHOD => 'delete', NAME => 'f1')
-  assert_no_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_no_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   drop_test_table(restore_table)
   command(:restore_snapshot, @create_test_snapshot)
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  drop_test_table(restore_table)
+end
+
+define_test 'Restore snapshot should fail' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
+  command(:create, restore_table, 'f1', 'f2')
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  command(:snapshot, restore_table, @create_test_snapshot)
+  assert_raise(RuntimeError) do
+command(:restore_snapshot, @create_test_snapshot)
+  end
   drop_test_table(restore_table)
 end
 
@@ -784,4 +798,5 @@ module Hbase
   drop_test_table(new_table)
 end
   end
+  # rubocop:enable ClassLength
 end

hbase git commit: HBASE-20253. Error message is missing for restore_snapshot

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 3eee7d37f -> bf7c631de


HBASE-20253. Error message is missing for restore_snapshot

Amending Author: Peter Somogyi 


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

Branch: refs/heads/branch-2
Commit: bf7c631deeb21c8618d08db5f1dda4c124771ef4
Parents: 3eee7d3
Author: Gabor Bota 
Authored: Mon Apr 9 14:28:11 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Apr 11 17:25:32 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands.rb   |  3 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb | 37 +++---
 2 files changed, 29 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/bf7c631d/hbase-shell/src/main/ruby/shell/commands.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands.rb 
b/hbase-shell/src/main/ruby/shell/commands.rb
index b4a3407..095e438 100644
--- a/hbase-shell/src/main/ruby/shell/commands.rb
+++ b/hbase-shell/src/main/ruby/shell/commands.rb
@@ -117,6 +117,9 @@ module Shell
 if cause.is_a?(org.apache.hadoop.hbase.TableNotEnabledException)
   raise "Table #{args.first} is disabled!"
 end
+if cause.is_a?(org.apache.hadoop.hbase.TableNotDisabledException)
+  raise "Table #{cause.message} should be disabled!"
+end
 if cause.is_a?(org.apache.hadoop.hbase.UnknownRegionException)
   raise "Unknown region #{args.first}!"
 end

http://git-wip-us.apache.org/repos/asf/hbase/blob/bf7c631d/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index a27bbc5..a3bf0f4 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -361,7 +361,7 @@ module Hbase
 end
   end
 
- # Simple administration methods tests
+  # Simple administration methods tests
   class AdminAlterTableTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -582,7 +582,8 @@ module Hbase
 end
   end
 
-# Simple administration methods tests
+  # Simple administration methods tests
+  # rubocop:disable ClassLength
   class AdminSnapshotTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -651,20 +652,33 @@ module Hbase
   end
 end
 
-define_test "Restore snapshot should work" do
-  drop_test_snapshot()
-  restore_table = "test_restore_snapshot_table"
+define_test 'Restore snapshot should work' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
   command(:create, restore_table, 'f1', 'f2')
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   command(:snapshot, restore_table, @create_test_snapshot)
   command(:alter, restore_table, METHOD => 'delete', NAME => 'f1')
-  assert_no_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_no_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   drop_test_table(restore_table)
   command(:restore_snapshot, @create_test_snapshot)
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  drop_test_table(restore_table)
+end
+
+define_test 'Restore snapshot should fail' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
+  command(:create, restore_table, 'f1', 'f2')
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  command(:snapshot, restore_table, @create_test_snapshot)
+  assert_raise(RuntimeError) do
+command(:restore_snapshot, @create_test_snapshot)
+  end
   drop_test_table(restore_table)
 end
 
@@ -784,4 +798,5 @@ module Hbase
   drop_test_table(new_table)
 end
   end
+  # rubocop:enable ClassLength
 end

hbase git commit: HBASE-20253. Error message is missing for restore_snapshot

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 37e5b0b1b -> 118c1a1f2


HBASE-20253. Error message is missing for restore_snapshot

Amending Author: Peter Somogyi 


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

Branch: refs/heads/master
Commit: 118c1a1f2fce9318bfbff88ae911f4919373aac1
Parents: 37e5b0b
Author: Gabor Bota 
Authored: Mon Apr 9 14:28:11 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Apr 11 17:24:36 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands.rb   |  3 ++
 hbase-shell/src/test/ruby/hbase/admin_test.rb | 37 +++---
 2 files changed, 29 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/118c1a1f/hbase-shell/src/main/ruby/shell/commands.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands.rb 
b/hbase-shell/src/main/ruby/shell/commands.rb
index 9fd634c..f63128f 100644
--- a/hbase-shell/src/main/ruby/shell/commands.rb
+++ b/hbase-shell/src/main/ruby/shell/commands.rb
@@ -119,6 +119,9 @@ module Shell
 if cause.is_a?(org.apache.hadoop.hbase.TableNotEnabledException)
   raise "Table #{args.first} is disabled!"
 end
+if cause.is_a?(org.apache.hadoop.hbase.TableNotDisabledException)
+  raise "Table #{cause.message} should be disabled!"
+end
 if cause.is_a?(org.apache.hadoop.hbase.UnknownRegionException)
   raise "Unknown region #{args.first}!"
 end

http://git-wip-us.apache.org/repos/asf/hbase/blob/118c1a1f/hbase-shell/src/test/ruby/hbase/admin_test.rb
--
diff --git a/hbase-shell/src/test/ruby/hbase/admin_test.rb 
b/hbase-shell/src/test/ruby/hbase/admin_test.rb
index a27bbc5..a3bf0f4 100644
--- a/hbase-shell/src/test/ruby/hbase/admin_test.rb
+++ b/hbase-shell/src/test/ruby/hbase/admin_test.rb
@@ -361,7 +361,7 @@ module Hbase
 end
   end
 
- # Simple administration methods tests
+  # Simple administration methods tests
   class AdminAlterTableTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -582,7 +582,8 @@ module Hbase
 end
   end
 
-# Simple administration methods tests
+  # Simple administration methods tests
+  # rubocop:disable ClassLength
   class AdminSnapshotTest < Test::Unit::TestCase
 include TestHelpers
 
@@ -651,20 +652,33 @@ module Hbase
   end
 end
 
-define_test "Restore snapshot should work" do
-  drop_test_snapshot()
-  restore_table = "test_restore_snapshot_table"
+define_test 'Restore snapshot should work' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
   command(:create, restore_table, 'f1', 'f2')
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   command(:snapshot, restore_table, @create_test_snapshot)
   command(:alter, restore_table, METHOD => 'delete', NAME => 'f1')
-  assert_no_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_no_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
   drop_test_table(restore_table)
   command(:restore_snapshot, @create_test_snapshot)
-  assert_match(eval("/" + "f1" + "/"), admin.describe(restore_table))
-  assert_match(eval("/" + "f2" + "/"), admin.describe(restore_table))
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  drop_test_table(restore_table)
+end
+
+define_test 'Restore snapshot should fail' do
+  drop_test_snapshot
+  restore_table = 'test_restore_snapshot_table'
+  command(:create, restore_table, 'f1', 'f2')
+  assert_match(/f1/, admin.describe(restore_table))
+  assert_match(/f2/, admin.describe(restore_table))
+  command(:snapshot, restore_table, @create_test_snapshot)
+  assert_raise(RuntimeError) do
+command(:restore_snapshot, @create_test_snapshot)
+  end
   drop_test_table(restore_table)
 end
 
@@ -784,4 +798,5 @@ module Hbase
   drop_test_table(new_table)
 end
   end
+  # rubocop:enable ClassLength
 end

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 b0701434e -> e51ced4f1


HBASE-20376 RowCounter and CellCounter documentations are incorrect


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

Branch: refs/heads/branch-2
Commit: e51ced4f174759fd794a787ba82bf139875a6a96
Parents: b070143
Author: Peter Somogyi 
Authored: Thu Apr 12 10:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:05:45 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 4 files changed, 45 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e51ced4f/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 5087e59..78dbbdd 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -104,6 +104,8 @@ if [ $# = 0 ]; then
   echo "  canary  Run the Canary tool"
   echo "  version Print the version"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -459,6 +461,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/e51ced4f/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void printUsage(int parameterCount) {
+System.err.println("ERROR: Wrong number of parameters: " 

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 e72a1c694 -> 263cc8d14


HBASE-20376 RowCounter and CellCounter documentations are incorrect


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

Branch: refs/heads/branch-2.0
Commit: 263cc8d14371db4abeebcf2967393ee4a1ae614f
Parents: e72a1c6
Author: Peter Somogyi 
Authored: Thu Apr 12 10:05:17 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:06:42 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 4 files changed, 45 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/263cc8d1/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 5087e59..78dbbdd 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -104,6 +104,8 @@ if [ $# = 0 ]; then
   echo "  canary  Run the Canary tool"
   echo "  version Print the version"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -459,6 +461,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/263cc8d1/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void printUsage(int parameterCount) {
+System.err.println("ERROR: Wrong number of 

hbase git commit: HBASE-20376 RowCounter and CellCounter documentations are incorrect

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 5a69465ea -> c4ebf666b


HBASE-20376 RowCounter and CellCounter documentations are incorrect


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

Branch: refs/heads/master
Commit: c4ebf666b78f92a6d02652eece8dd95360bd0482
Parents: 5a69465
Author: Peter Somogyi 
Authored: Tue Apr 10 15:16:03 2018 +0200
Committer: Peter Somogyi 
Committed: Thu Apr 12 10:00:38 2018 +0200

--
 bin/hbase   |  6 +++
 .../hadoop/hbase/mapreduce/CellCounter.java | 47 +++-
 .../hadoop/hbase/mapreduce/RowCounter.java  |  6 +--
 .../hadoop/hbase/mapreduce/TestRowCounter.java  | 22 +
 src/main/asciidoc/_chapters/ops_mgt.adoc| 31 -
 5 files changed, 64 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/bin/hbase
--
diff --git a/bin/hbase b/bin/hbase
index 8e37f5f..f1e2306 100755
--- a/bin/hbase
+++ b/bin/hbase
@@ -106,6 +106,8 @@ if [ $# = 0 ]; then
   echo "  backup  Backup tables for recovery"
   echo "  restore Restore tables from existing backup image"
   echo "  regionsplitter  Run RegionSplitter tool"
+  echo "  rowcounter  Run RowCounter tool"
+  echo "  cellcounter Run CellCounter tool"
   echo "  CLASSNAME   Run the class named CLASSNAME"
   exit 1
 fi
@@ -465,6 +467,10 @@ elif [ "$COMMAND" = "version" ] ; then
   CLASS='org.apache.hadoop.hbase.util.VersionInfo'
 elif [ "$COMMAND" = "regionsplitter" ] ; then
   CLASS='org.apache.hadoop.hbase.util.RegionSplitter'
+elif [ "$COMMAND" = "rowcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.RowCounter'
+elif [ "$COMMAND" = "cellcounter" ] ; then
+  CLASS='org.apache.hadoop.hbase.mapreduce.CellCounter'
 else
   CLASS=$COMMAND
 fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/c4ebf666/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
--
diff --git 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
index aa79aac..ff0f01c 100644
--- 
a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
+++ 
b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/CellCounter.java
@@ -292,33 +292,38 @@ public class CellCounter extends Configured implements 
Tool {
   @Override
   public int run(String[] args) throws Exception {
 if (args.length < 2) {
-  System.err.println("ERROR: Wrong number of parameters: " + args.length);
-  System.err.println("Usage: CellCounter ");
-  System.err.println("  
[^[regex pattern] or " +
-"[Prefix] for row filter]] --starttime=[starttime] 
--endtime=[endtime]");
-  System.err.println("  Note: -D properties will be applied to the conf 
used. ");
-  System.err.println("  Additionally, all of the SCAN properties from 
TableInputFormat");
-  System.err.println("  can be specified to get fine grained control on 
what is counted..");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_ROW_STOP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMNS + "=\" 
...\"");
-  System.err.println("   -D " + TableInputFormat.SCAN_COLUMN_FAMILY + 
"=,, ...");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMESTAMP + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_START + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_TIMERANGE_END + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_MAXVERSIONS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_CACHEDROWS + 
"=");
-  System.err.println("   -D " + TableInputFormat.SCAN_BATCHSIZE + 
"=");
-  System.err.println("  parameter can be used to override 
the default report separator " +
-  "string : used to separate the rowId/column family name and 
qualifier name.");
-  System.err.println(" [^[regex pattern] or [Prefix] parameter can be used 
to limit the cell counter count " +
-  "operation to a limited subset of rows from the table based on regex 
or prefix pattern.");
+  printUsage(args.length);
   return -1;
 }
 Job job = createSubmittableJob(getConf(), args);
 return (job.waitForCompletion(true) ? 0 : 1);
   }
 
+  private void 

hbase git commit: HBASE-20355 fix links in upgrade section of ref guide.

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 8f6849ff0 -> c310ef7ff


HBASE-20355 fix links in upgrade section of ref guide.


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

Branch: refs/heads/master
Commit: c310ef7ffd0680f8efd9a92e0a5179c02655ea6d
Parents: 8f6849f
Author: Sean Busbey 
Authored: Thu Apr 5 12:53:25 2018 -0500
Committer: Peter Somogyi 
Committed: Fri Apr 6 10:21:20 2018 +0200

--
 src/main/asciidoc/_chapters/upgrading.adoc | 28 -
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c310ef7f/src/main/asciidoc/_chapters/upgrading.adoc
--
diff --git a/src/main/asciidoc/_chapters/upgrading.adoc 
b/src/main/asciidoc/_chapters/upgrading.adoc
index 31589d7..d07133c 100644
--- a/src/main/asciidoc/_chapters/upgrading.adoc
+++ b/src/main/asciidoc/_chapters/upgrading.adoc
@@ -317,7 +317,7 @@ First we'll cover deployment / operational changes that you 
might hit when upgra
 
 [[upgrade2.0.basic.requirements]]
 .Update to basic prerequisite minimums in HBase 2.0+
-As noted in the section [[basic.prerequisites]], HBase 2.0+ requires a minimum 
of Java 8 and Hadoop 2.6. The HBase community recommends ensuring you have 
already completed any needed upgrades in prerequisites prior to upgrading your 
HBase version.
+As noted in the section <>, HBase 2.0+ requires a minimum 
of Java 8 and Hadoop 2.6. The HBase community recommends ensuring you have 
already completed any needed upgrades in prerequisites prior to upgrading your 
HBase version.
 
 [[upgrade2.0.hbck]]
 .HBCK must match HBase server version
@@ -334,7 +334,7 @@ Link to a ref guide section on HBCK in 2.0 that explains 
use and calls out the i
 
 The following configuration settings are no longer applicable or available. 
For details, please see the detailed release notes.
 
-* hbase.config.read.zookeeper.config (see [[upgrade2.0.zkconfig]] for 
migration details)
+* hbase.config.read.zookeeper.config (see <> for 
migration details)
 * hbase.zookeeper.useMulti (HBase now always uses ZK's multi functionality)
 * hbase.rpc.client.threads.max
 * hbase.rpc.client.nativetransport
@@ -343,10 +343,10 @@ The following configuration settings are no longer 
applicable or available. For
 * hbase.bucketcache.combinedcache.enabled
 * hbase.bucketcache.ioengine no longer supports the 'heap' value.
 * hbase.bulkload.staging.dir
-* hbase.balancer.tablesOnMaster wasn't removed, strictly speaking, but its 
meaning has fundamentally changed and users should not set it. See the section 
[[upgrade2.0.regions.on.master]] for details.
-* hbase.master.distributed.log.replay See the section 
[[upgrade2.0.distributed.log.replay]] for details
-* hbase.regionserver.disallow.writes.when.recovering See the section 
[[upgrade2.0.distributed.log.replay]] for details
-* hbase.regionserver.wal.logreplay.batch.size See the section 
[[upgrade2.0.distributed.log.replay]] for details
+* hbase.balancer.tablesOnMaster wasn't removed, strictly speaking, but its 
meaning has fundamentally changed and users should not set it. See the section 
<> for details.
+* hbase.master.distributed.log.replay See the section 
<> for details
+* hbase.regionserver.disallow.writes.when.recovering See the section 
<> for details
+* hbase.regionserver.wal.logreplay.batch.size See the section 
<> for details
 * hbase.master.catalog.timeout
 * hbase.regionserver.catalog.timeout
 * hbase.metrics.exposeOperationTimes
@@ -375,14 +375,14 @@ The following properties have been renamed. Attempts to 
set the old property wil
 The following configuration settings changed their default value. Where 
applicable, the value to set to restore the behavior of HBase 1.2 is given.
 
 * hbase.security.authorization now defaults to false. set to true to restore 
same behavior as previous default.
-* hbase.client.retries.number is now set to 10. Previously it was 35. 
Downstream users are advised to use client timeouts as described in section 
[[config_timeouts]] instead.
-* hbase.client.serverside.retries.multiplier is now set to 3. Previously it 
was 10. Downstream users are advised to use client timesout as describe in 
section [[config_timeouts]] instead.
+* hbase.client.retries.number is now set to 10. Previously it was 35. 
Downstream users are advised to use client timeouts as described in section 
<> instead.
+* hbase.client.serverside.retries.multiplier is now set to 3. Previously it 
was 10. Downstream users are advised to use client timesout as describe in 
section <> instead.
 * 

hbase git commit: HBASE-20344 Fix asciidoc warnings

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master d59a6c816 -> 826909a59


HBASE-20344 Fix asciidoc warnings

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/master
Commit: 826909a59cf27adb1578c627e743233b378922a5
Parents: d59a6c8
Author: Peter Somogyi 
Authored: Wed Apr 4 13:36:48 2018 +0200
Committer: Peter Somogyi 
Committed: Fri Apr 13 11:32:40 2018 +0200

--
 src/main/asciidoc/_chapters/backup_restore.adoc | 106 +--
 src/main/asciidoc/_chapters/compression.adoc|  20 
 .../asciidoc/_chapters/getting_started.adoc |   7 --
 src/main/asciidoc/_chapters/hbase_mob.adoc  |   4 -
 src/main/asciidoc/_chapters/ops_mgt.adoc|   3 -
 src/main/asciidoc/_chapters/performance.adoc|   2 -
 src/main/asciidoc/_chapters/schema_design.adoc  |   2 -
 src/main/asciidoc/_chapters/security.adoc   |  12 ---
 src/main/asciidoc/_chapters/shell.adoc  |   2 -
 9 files changed, 53 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/826909a5/src/main/asciidoc/_chapters/backup_restore.adoc
--
diff --git a/src/main/asciidoc/_chapters/backup_restore.adoc 
b/src/main/asciidoc/_chapters/backup_restore.adoc
index b02af41..cb7fced 100644
--- a/src/main/asciidoc/_chapters/backup_restore.adoc
+++ b/src/main/asciidoc/_chapters/backup_restore.adoc
@@ -175,7 +175,7 @@ and its options. The below information is captured in this 
help message for each
 // hbase backup create
 
 [[br.creating.complete.backup]]
-### Creating a Backup Image
+=== Creating a Backup Image
 
 [NOTE]
 
@@ -204,7 +204,7 @@ dataset with a restore operation, having the backup ID 
readily available can sav
 
 
 [[br.create.positional.cli.arguments]]
- Positional Command-Line Arguments
+ Positional Command-Line Arguments
 
 _type_::
   The type of backup to execute: _full_ or _incremental_. As a reminder, an 
_incremental_ backup requires a _full_ backup to
@@ -215,7 +215,7 @@ _backup_path_::
   are _hdfs:_, _webhdfs:_, _gpfs:_, and _s3fs:_.
 
 [[br.create.named.cli.arguments]]
- Named Command-Line Arguments
+ Named Command-Line Arguments
 
 _-t _::
   A comma-separated list of tables to back up. If no tables are specified, all 
tables are backed up. No regular-expression or
@@ -242,7 +242,7 @@ _-q _::
   is useful to prevent backup tasks from stealing resources away from other 
MapReduce jobs of high importance.
 
 [[br.usage.examples]]
- Example usage
+ Example usage
 
 [source]
 
@@ -255,7 +255,7 @@ in the path _/data/backup_. The _-w_ option specifies that 
no more than three pa
 // hbase backup restore
 
 [[br.restoring.backup]]
-### Restoring a Backup Image
+=== Restoring a Backup Image
 
 Run the following command as an HBase superuser. You can only restore a backup 
on a running HBase cluster because the data must be
 redistributed the RegionServers for the operation to complete successfully.
@@ -266,7 +266,7 @@ hbase restore  
 
 
 [[br.restore.positional.args]]
- Positional Command-Line Arguments
+ Positional Command-Line Arguments
 
 _backup_path_::
   The _backup_path_ argument specifies the full filesystem URI of where to 
store the backup image. Valid prefixes are
@@ -277,7 +277,7 @@ _backup_id_::
 
 
 [[br.restore.named.args]]
- Named Command-Line Arguments
+ Named Command-Line Arguments
 
 _-t _::
   A comma-separated list of tables to restore. See 
<> for more
@@ -304,7 +304,7 @@ _-o_::
 
 
 [[br.restore.usage]]
- Example of Usage
+ Example of Usage
 
 [source]
 
@@ -319,7 +319,7 @@ This command restores two tables of an incremental backup 
image. In this example
 // hbase backup merge
 
 [[br.merge.backup]]
-### Merging Incremental Backup Images
+=== Merging Incremental Backup Images
 
 This command can be used to merge two or more incremental backup images into a 
single incremental
 backup image. This can be used to consolidate multiple, small incremental 
backup images into a single
@@ -332,18 +332,18 @@ $ hbase backup merge 
 
 
 [[br.merge.backup.positional.cli.arguments]]
- Positional Command-Line Arguments
+ Positional Command-Line Arguments
 
 _backup_ids_::
   A comma-separated list of incremental backup image IDs that are to be 
combined into a single image.
 
 [[br.merge.backup.named.cli.arguments]]
- Named Command-Line Arguments
+ Named Command-Line Arguments
 
 None.

[1/2] hbase git commit: HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-archetypes module

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 0eacb3ea0 -> cba88d15e


HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-archetypes 
module


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

Branch: refs/heads/branch-2.0
Commit: ee3c4303bf13e59df3e61b1c611f9c3a813ac0ac
Parents: 0eacb3e
Author: tedyu 
Authored: Tue Mar 27 13:51:44 2018 -0700
Committer: Peter Somogyi 
Committed: Fri Apr 13 17:33:33 2018 +0200

--
 .../src/test/resources/hbase-site.xml   | 39 
 .../src/test/resources/hbase-site.xml   | 39 
 2 files changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ee3c4303/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml
--
diff --git 
a/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml 
b/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml
new file mode 100644
index 000..858d428
--- /dev/null
+++ b/hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml
@@ -0,0 +1,39 @@
+
+
+
+
+  
+hbase.defaults.for.version.skip
+true
+  
+  
+hbase.hconnection.threads.keepalivetime
+3
+  
+  
+hbase.localcluster.assign.random.ports
+true
+
+  Assign random ports to master and RS info server (UI).
+
+  
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/ee3c4303/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml
--
diff --git 
a/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml
 
b/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml
new file mode 100644
index 000..858d428
--- /dev/null
+++ 
b/hbase-archetypes/hbase-shaded-client-project/src/test/resources/hbase-site.xml
@@ -0,0 +1,39 @@
+
+
+
+
+  
+hbase.defaults.for.version.skip
+true
+  
+  
+hbase.hconnection.threads.keepalivetime
+3
+  
+  
+hbase.localcluster.assign.random.ports
+true
+
+  Assign random ports to master and RS info server (UI).
+
+  
+

[2/2] hbase git commit: HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-endpoint and hbase-rsgroup modules

[psomogyi]

HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-endpoint 
and hbase-rsgroup modules


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

Branch: refs/heads/branch-2.0
Commit: cba88d15eb450e49b004651f418e7e6a49666a0d
Parents: ee3c430
Author: tedyu 
Authored: Mon Apr 2 17:57:56 2018 -0700
Committer: Peter Somogyi 
Committed: Fri Apr 13 17:33:48 2018 +0200

--
 .../src/test/resources/hbase-site.xml   | 39 
 hbase-rsgroup/src/test/resources/hbase-site.xml | 39 
 2 files changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cba88d15/hbase-endpoint/src/test/resources/hbase-site.xml
--
diff --git a/hbase-endpoint/src/test/resources/hbase-site.xml 
b/hbase-endpoint/src/test/resources/hbase-site.xml
new file mode 100644
index 000..858d428
--- /dev/null
+++ b/hbase-endpoint/src/test/resources/hbase-site.xml
@@ -0,0 +1,39 @@
+
+
+
+
+  
+hbase.defaults.for.version.skip
+true
+  
+  
+hbase.hconnection.threads.keepalivetime
+3
+  
+  
+hbase.localcluster.assign.random.ports
+true
+
+  Assign random ports to master and RS info server (UI).
+
+  
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/cba88d15/hbase-rsgroup/src/test/resources/hbase-site.xml
--
diff --git a/hbase-rsgroup/src/test/resources/hbase-site.xml 
b/hbase-rsgroup/src/test/resources/hbase-site.xml
new file mode 100644
index 000..858d428
--- /dev/null
+++ b/hbase-rsgroup/src/test/resources/hbase-site.xml
@@ -0,0 +1,39 @@
+
+
+
+
+  
+hbase.defaults.for.version.skip
+true
+  
+  
+hbase.hconnection.threads.keepalivetime
+3
+  
+  
+hbase.localcluster.assign.random.ports
+true
+
+  Assign random ports to master and RS info server (UI).
+
+  
+

hbase git commit: HBASE-20409 Set hbase.client.meta.operation.timeout in TestClientOperationTimeout

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 53eb0f60c -> 4fea86296


HBASE-20409 Set hbase.client.meta.operation.timeout in 
TestClientOperationTimeout

Signed-off-by: Ted Yu 


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

Branch: refs/heads/branch-2
Commit: 4fea86296312816c375ea43f5fff5df5c039b98a
Parents: 53eb0f6
Author: Peter Somogyi 
Authored: Fri Apr 13 13:57:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sun Apr 15 10:12:34 2018 +0200

--
 .../java/org/apache/hadoop/hbase/TestClientOperationTimeout.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4fea8629/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
index 61e63e8..fa4e017 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
@@ -84,6 +84,7 @@ public class TestClientOperationTimeout {
   @BeforeClass
   public static void setUpClass() throws Exception {
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
 500);
+
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);
 

hbase git commit: HBASE-20409 Set hbase.client.meta.operation.timeout in TestClientOperationTimeout

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 fb01cc42c -> bbe15510e


HBASE-20409 Set hbase.client.meta.operation.timeout in 
TestClientOperationTimeout

Signed-off-by: Ted Yu 


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

Branch: refs/heads/branch-2.0
Commit: bbe15510ec849c016a437c904798a8d9a010e40e
Parents: fb01cc4
Author: Peter Somogyi 
Authored: Fri Apr 13 13:57:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sun Apr 15 10:12:59 2018 +0200

--
 .../java/org/apache/hadoop/hbase/TestClientOperationTimeout.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/bbe15510/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
index 61e63e8..fa4e017 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
@@ -84,6 +84,7 @@ public class TestClientOperationTimeout {
   @BeforeClass
   public static void setUpClass() throws Exception {
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
 500);
+
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);
 

hbase git commit: HBASE-20409 Set hbase.client.meta.operation.timeout in TestClientOperationTimeout

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 0a31ea485 -> 125767b44


HBASE-20409 Set hbase.client.meta.operation.timeout in 
TestClientOperationTimeout

Signed-off-by: Ted Yu 


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

Branch: refs/heads/master
Commit: 125767b44e93f1094b77a6cf8c2a5ca19b5cabd2
Parents: 0a31ea4
Author: Peter Somogyi 
Authored: Fri Apr 13 13:57:14 2018 +0200
Committer: Peter Somogyi 
Committed: Sun Apr 15 10:12:00 2018 +0200

--
 .../java/org/apache/hadoop/hbase/TestClientOperationTimeout.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/125767b4/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
index 61e63e8..fa4e017 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
@@ -84,6 +84,7 @@ public class TestClientOperationTimeout {
   @BeforeClass
   public static void setUpClass() throws Exception {
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
 500);
+
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);
 
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);
 

hbase git commit: HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 7483b111e -> 3c6cfd9ed


HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-2.0
Commit: 3c6cfd9edfbb9fb8a7bc020abf40fcf61a6821b4
Parents: 7483b11
Author: Balazs Meszaros 
Authored: Mon Apr 16 16:33:48 2018 +0200
Committer: Peter Somogyi 
Committed: Mon Apr 23 11:09:58 2018 +0200

--
 .../hadoop/hbase/thrift/ThriftServerRunner.java | 24 ++--
 .../resources/hbase-webapps/thrift/thrift.jsp   | 11 +
 2 files changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3c6cfd9e/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
--
diff --git 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
index 16894ad..48cf0e5 100644
--- 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
+++ 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
@@ -138,6 +138,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
+import org.apache.hbase.thirdparty.com.google.common.base.Splitter;
 import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
@@ -222,7 +223,7 @@ public class ThriftServerRunner implements Runnable {
   private final JvmPauseMonitor pauseMonitor;
 
   /** An enum of server implementation selections */
-  enum ImplType {
+  public enum ImplType {
 HS_HA("hsha", true, THsHaServer.class, true),
 NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),
 THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),
@@ -236,7 +237,7 @@ public class ThriftServerRunner implements Runnable {
 final Class serverClass;
 final boolean canSpecifyBindIP;
 
-ImplType(String option, boolean isAlwaysFramed,
+private ImplType(String option, boolean isAlwaysFramed,
 Class serverClass, boolean canSpecifyBindIP) {
   this.option = option;
   this.isAlwaysFramed = isAlwaysFramed;
@@ -253,7 +254,15 @@ public class ThriftServerRunner implements Runnable {
   return "-" + option;
 }
 
-String getDescription() {
+public String getOption() {
+  return option;
+}
+
+public boolean isAlwaysFramed() {
+  return isAlwaysFramed;
+}
+
+public String getDescription() {
   StringBuilder sb = new StringBuilder("Use the " +
   serverClass.getSimpleName());
   if (isAlwaysFramed) {
@@ -273,7 +282,7 @@ public class ThriftServerRunner implements Runnable {
   return group;
 }
 
-static ImplType getServerImpl(Configuration conf) {
+public static ImplType getServerImpl(Configuration conf) {
   String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);
   for (ImplType t : values()) {
 if (confType.equals(t.option)) {
@@ -1971,13 +1980,14 @@ public class ThriftServerRunner implements Runnable {
 
   public static void registerFilters(Configuration conf) {
 String[] filters = conf.getStrings("hbase.thrift.filters");
+Splitter splitter = Splitter.on(':');
 if(filters != null) {
   for(String filterClass: filters) {
-String[] filterPart = filterClass.split(":");
-if(filterPart.length != 2) {
+List filterPart = splitter.splitToList(filterClass);
+if(filterPart.size() != 2) {
   LOG.warn("Invalid filter specification " + filterClass + " - 
skipping");
 } else {
-  ParseFilter.registerFilter(filterPart[0], filterPart[1]);
+  ParseFilter.registerFilter(filterPart.get(0), filterPart.get(1));
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c6cfd9e/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
--
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp 
b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
index 579d0f7..eb329fe 100644
--- 

hbase git commit: HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 e93cfb52d -> 035515d4c


HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-2
Commit: 035515d4c287030732ae2b0d5aafb1c89d39e106
Parents: e93cfb5
Author: Balazs Meszaros 
Authored: Mon Apr 16 16:33:48 2018 +0200
Committer: Peter Somogyi 
Committed: Mon Apr 23 11:06:31 2018 +0200

--
 .../hadoop/hbase/thrift/ThriftServerRunner.java | 24 ++--
 .../resources/hbase-webapps/thrift/thrift.jsp   | 11 +
 2 files changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/035515d4/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
--
diff --git 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
index 5d887f9..58f069c 100644
--- 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
+++ 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
@@ -139,6 +139,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
+import org.apache.hbase.thirdparty.com.google.common.base.Splitter;
 import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
@@ -223,7 +224,7 @@ public class ThriftServerRunner implements Runnable {
   private final JvmPauseMonitor pauseMonitor;
 
   /** An enum of server implementation selections */
-  enum ImplType {
+  public enum ImplType {
 HS_HA("hsha", true, THsHaServer.class, true),
 NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),
 THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),
@@ -237,7 +238,7 @@ public class ThriftServerRunner implements Runnable {
 final Class serverClass;
 final boolean canSpecifyBindIP;
 
-ImplType(String option, boolean isAlwaysFramed,
+private ImplType(String option, boolean isAlwaysFramed,
 Class serverClass, boolean canSpecifyBindIP) {
   this.option = option;
   this.isAlwaysFramed = isAlwaysFramed;
@@ -254,7 +255,15 @@ public class ThriftServerRunner implements Runnable {
   return "-" + option;
 }
 
-String getDescription() {
+public String getOption() {
+  return option;
+}
+
+public boolean isAlwaysFramed() {
+  return isAlwaysFramed;
+}
+
+public String getDescription() {
   StringBuilder sb = new StringBuilder("Use the " +
   serverClass.getSimpleName());
   if (isAlwaysFramed) {
@@ -274,7 +283,7 @@ public class ThriftServerRunner implements Runnable {
   return group;
 }
 
-static ImplType getServerImpl(Configuration conf) {
+public static ImplType getServerImpl(Configuration conf) {
   String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);
   for (ImplType t : values()) {
 if (confType.equals(t.option)) {
@@ -1973,13 +1982,14 @@ public class ThriftServerRunner implements Runnable {
 
   public static void registerFilters(Configuration conf) {
 String[] filters = conf.getStrings("hbase.thrift.filters");
+Splitter splitter = Splitter.on(':');
 if(filters != null) {
   for(String filterClass: filters) {
-String[] filterPart = filterClass.split(":");
-if(filterPart.length != 2) {
+List filterPart = splitter.splitToList(filterClass);
+if(filterPart.size() != 2) {
   LOG.warn("Invalid filter specification " + filterClass + " - 
skipping");
 } else {
-  ParseFilter.registerFilter(filterPart[0], filterPart[1]);
+  ParseFilter.registerFilter(filterPart.get(0), filterPart.get(1));
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/035515d4/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
--
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp 
b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
index 579d0f7..eb329fe 100644
--- 

hbase git commit: HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 193359ffd -> e73ba582f


HBASE-20427 thrift.jsp displays "Framed transport" incorrectly

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/master
Commit: e73ba582f23e7ac512665bac2539af53bd3cb47c
Parents: 193359f
Author: Balazs Meszaros 
Authored: Mon Apr 16 16:33:48 2018 +0200
Committer: Peter Somogyi 
Committed: Mon Apr 23 11:05:53 2018 +0200

--
 .../hadoop/hbase/thrift/ThriftServerRunner.java | 24 ++--
 .../resources/hbase-webapps/thrift/thrift.jsp   | 11 +
 2 files changed, 23 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e73ba582/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
--
diff --git 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
index 28ba28a..1db9256 100644
--- 
a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
+++ 
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
@@ -139,6 +139,7 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hbase.thirdparty.com.google.common.base.Joiner;
+import org.apache.hbase.thirdparty.com.google.common.base.Splitter;
 import org.apache.hbase.thirdparty.com.google.common.base.Throwables;
 import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
@@ -224,7 +225,7 @@ public class ThriftServerRunner implements Runnable {
   private final JvmPauseMonitor pauseMonitor;
 
   /** An enum of server implementation selections */
-  enum ImplType {
+  public enum ImplType {
 HS_HA("hsha", true, THsHaServer.class, true),
 NONBLOCKING("nonblocking", true, TNonblockingServer.class, true),
 THREAD_POOL("threadpool", false, TBoundedThreadPoolServer.class, true),
@@ -238,7 +239,7 @@ public class ThriftServerRunner implements Runnable {
 final Class serverClass;
 final boolean canSpecifyBindIP;
 
-ImplType(String option, boolean isAlwaysFramed,
+private ImplType(String option, boolean isAlwaysFramed,
 Class serverClass, boolean canSpecifyBindIP) {
   this.option = option;
   this.isAlwaysFramed = isAlwaysFramed;
@@ -255,7 +256,15 @@ public class ThriftServerRunner implements Runnable {
   return "-" + option;
 }
 
-String getDescription() {
+public String getOption() {
+  return option;
+}
+
+public boolean isAlwaysFramed() {
+  return isAlwaysFramed;
+}
+
+public String getDescription() {
   StringBuilder sb = new StringBuilder("Use the " +
   serverClass.getSimpleName());
   if (isAlwaysFramed) {
@@ -275,7 +284,7 @@ public class ThriftServerRunner implements Runnable {
   return group;
 }
 
-static ImplType getServerImpl(Configuration conf) {
+public static ImplType getServerImpl(Configuration conf) {
   String confType = conf.get(SERVER_TYPE_CONF_KEY, THREAD_POOL.option);
   for (ImplType t : values()) {
 if (confType.equals(t.option)) {
@@ -1979,13 +1988,14 @@ public class ThriftServerRunner implements Runnable {
 
   public static void registerFilters(Configuration conf) {
 String[] filters = conf.getStrings("hbase.thrift.filters");
+Splitter splitter = Splitter.on(':');
 if(filters != null) {
   for(String filterClass: filters) {
-String[] filterPart = filterClass.split(":");
-if(filterPart.length != 2) {
+List filterPart = splitter.splitToList(filterClass);
+if(filterPart.size() != 2) {
   LOG.warn("Invalid filter specification " + filterClass + " - 
skipping");
 } else {
-  ParseFilter.registerFilter(filterPart[0], filterPart[1]);
+  ParseFilter.registerFilter(filterPart.get(0), filterPart.get(1));
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/e73ba582/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
--
diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp 
b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
index 579d0f7..eb329fe 100644
--- 

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 caf4c4b4e -> 8018c28c2


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-1
Commit: 8018c28c2b73ea0301d7b74256f5a93d7eab57ee
Parents: caf4c4b
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:35:13 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8018c28c/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 05295b7..16d3728 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 return <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/8018c28c/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 9f65fdd..05db24f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 return <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 c6fe80b98 -> d6036447b


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-1.4
Commit: d6036447b41dbf51bba4d12250d5504450af0c50
Parents: c6fe80b
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:36:01 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d6036447/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 05295b7..16d3728 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 return <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/d6036447/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 9f65fdd..05db24f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 return <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 056c3395d -> 2a2258656


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/master
Commit: 2a2258656b2fcd92b967131b6c1f037363553bc4
Parents: 056c339
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:30:50 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2a225865/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 4ad9674..a3907a1 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/2a225865/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 2ed262b..e492db5 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 c11458448 -> cbea942ef


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-2.0
Commit: cbea942efbbc7197423b99c9666baff965511d96
Parents: c114584
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:33:59 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cbea942e/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 4ad9674..a3907a1 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/cbea942e/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 2ed262b..e492db5 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 e1afc5932 -> c329a3438


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-2
Commit: c329a3438f714729e69e73390bf9b9b7adcc182c
Parents: e1afc59
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:33:13 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c329a343/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 4ad9674..a3907a1 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/c329a343/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 2ed262b..e492db5 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 1bedb5bfb -> 3791d2e20


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-1.3
Commit: 3791d2e20dc9fcd500f80f1efbc99571193b55f6
Parents: 1bedb5b
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:36:59 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/3791d2e2/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 05295b7..16d3728 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 return <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/3791d2e2/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 9f65fdd..05db24f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 return <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20292 Wrong URLs in the descriptions for update_all_config and update_config commands in shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 0827b300f -> 130f83246


HBASE-20292 Wrong URLs in the descriptions for update_all_config and 
update_config commands in shell


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

Branch: refs/heads/branch-1.2
Commit: 130f832463d2727b081d08451e75a6087968a40d
Parents: 0827b30
Author: Toshihiro Suzuki 
Authored: Tue Mar 27 15:17:45 2018 +0900
Committer: Peter Somogyi 
Committed: Tue Mar 27 09:37:47 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/update_all_config.rb | 2 +-
 hbase-shell/src/main/ruby/shell/commands/update_config.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/130f8324/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
index 05295b7..16d3728 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_all_config.rb
@@ -23,7 +23,7 @@ module Shell
   def help
 return <<-EOF
 Reload a subset of configuration on all servers in the cluster.  See
-http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_all_config
 EOF

http://git-wip-us.apache.org/repos/asf/hbase/blob/130f8324/hbase-shell/src/main/ruby/shell/commands/update_config.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/update_config.rb 
b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
index 9f65fdd..05db24f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/update_config.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/update_config.rb
@@ -24,7 +24,7 @@ module Shell
 return <<-EOF
 Reload a subset of configuration on server 'servername' where servername is
 host, port plus startcode. For example: host187.example.com,60020,1289493121758
-See http://hbase.apache.org/book.html?dyn_config for more details. Here is how
+See http://hbase.apache.org/book.html#dyn_config for more details. Here is how
 you would run the command in the hbase shell:
   hbase> update_config 'servername'
 EOF

hbase git commit: HBASE-20290 Typo in enable_table_replication error message

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 130f83246 -> 0a761c0ae


HBASE-20290 Typo in enable_table_replication error message


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

Branch: refs/heads/branch-1.2
Commit: 0a761c0ae20a8757fed31661598096a07ecf0749
Parents: 130f832
Author: Gabor Bota 
Authored: Tue Mar 27 18:43:16 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Mar 28 09:01:56 2018 +0200

--
 .../apache/hadoop/hbase/client/replication/ReplicationAdmin.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0a761c0a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
index 04cb5bf..7d870f4 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
@@ -622,7 +622,7 @@ public class ReplicationAdmin implements Closeable {
   } else if (!peerHtd.equals(htd)) {
 throw new IllegalArgumentException("Table " + 
tableName.getNameAsString()
 + " exists in peer cluster " + repPeer.getId()
-+ ", but the table descriptors are not same when comapred with 
source cluster."
++ ", but the table descriptors are not same when compared with 
source cluster."
 + " Thus can not enable the table's replication switch.");
   }
 }

hbase git commit: HBASE-20254 Incorrect help message for merge_region

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 7c03ea043 -> 1e57aadbe


HBASE-20254 Incorrect help message for merge_region


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

Branch: refs/heads/branch-2
Commit: 1e57aadbe8577dd9b25b2f6732b8288c88b3b556
Parents: 7c03ea0
Author: Peter Somogyi 
Authored: Thu Mar 22 16:55:21 2018 +0100
Committer: Peter Somogyi 
Committed: Mon Mar 26 19:52:55 2018 +0200

--
 hbase-shell/src/main/ruby/hbase/admin.rb |  6 --
 hbase-shell/src/main/ruby/shell/commands/merge_region.rb | 10 ++
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/1e57aadb/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index f35dcb0..e409e39 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -468,8 +468,10 @@ module Hbase
 
 
#--
 # Merge two regions
-def merge_region(encoded_region_a_name, encoded_region_b_name, force)
-  @admin.mergeRegions(encoded_region_a_name.to_java_bytes, 
encoded_region_b_name.to_java_bytes, java.lang.Boolean.valueOf(force))
+def merge_region(region_a_name, region_b_name, force)
+  @admin.mergeRegions(region_a_name.to_java_bytes,
+  region_b_name.to_java_bytes,
+  java.lang.Boolean.valueOf(force))
 end
 
 
#--

http://git-wip-us.apache.org/repos/asf/hbase/blob/1e57aadb/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb 
b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
index 9c66770..b4f6cae 100644
--- a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
@@ -26,21 +26,23 @@ Merge two regions. Passing 'true' as the optional third 
parameter will force
 a merge ('force' merges regardless else merge will fail unless passed
 adjacent regions. 'force' is for expert use only).
 
-NOTE: You must pass the encoded region name, not the full region name so
-this command is a little different from other region operations.  The encoded
+You can pass the encoded region name or the full region name.  The encoded
 region name is the hash suffix on region names: e.g. if the region name were
 TestTable,0094429456,1289497600452.527db22f95c8a9e0116f0cc13c680396. then
 the encoded region name portion is 527db22f95c8a9e0116f0cc13c680396
 
 Examples:
 
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME'
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME', true
+
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME'
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME', true
 EOF
   end
 
-  def command(encoded_region_a_name, encoded_region_b_name, force = 
'false')
-admin.merge_region(encoded_region_a_name, encoded_region_b_name, force)
+  def command(region_a_name, region_b_name, force = 'false')
+admin.merge_region(region_a_name, region_b_name, force)
   end
 end
   end

hbase git commit: HBASE-20254 Incorrect help message for merge_region

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 83fa0ad9e -> 442816954


HBASE-20254 Incorrect help message for merge_region


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

Branch: refs/heads/master
Commit: 4428169542971645e69cd6d2851e094ecc278f72
Parents: 83fa0ad
Author: Peter Somogyi 
Authored: Thu Mar 22 16:55:21 2018 +0100
Committer: Peter Somogyi 
Committed: Mon Mar 26 19:52:10 2018 +0200

--
 hbase-shell/src/main/ruby/hbase/admin.rb |  6 --
 hbase-shell/src/main/ruby/shell/commands/merge_region.rb | 10 ++
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/44281695/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index f35dcb0..e409e39 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -468,8 +468,10 @@ module Hbase
 
 
#--
 # Merge two regions
-def merge_region(encoded_region_a_name, encoded_region_b_name, force)
-  @admin.mergeRegions(encoded_region_a_name.to_java_bytes, 
encoded_region_b_name.to_java_bytes, java.lang.Boolean.valueOf(force))
+def merge_region(region_a_name, region_b_name, force)
+  @admin.mergeRegions(region_a_name.to_java_bytes,
+  region_b_name.to_java_bytes,
+  java.lang.Boolean.valueOf(force))
 end
 
 
#--

http://git-wip-us.apache.org/repos/asf/hbase/blob/44281695/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb 
b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
index 9c66770..b4f6cae 100644
--- a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
@@ -26,21 +26,23 @@ Merge two regions. Passing 'true' as the optional third 
parameter will force
 a merge ('force' merges regardless else merge will fail unless passed
 adjacent regions. 'force' is for expert use only).
 
-NOTE: You must pass the encoded region name, not the full region name so
-this command is a little different from other region operations.  The encoded
+You can pass the encoded region name or the full region name.  The encoded
 region name is the hash suffix on region names: e.g. if the region name were
 TestTable,0094429456,1289497600452.527db22f95c8a9e0116f0cc13c680396. then
 the encoded region name portion is 527db22f95c8a9e0116f0cc13c680396
 
 Examples:
 
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME'
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME', true
+
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME'
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME', true
 EOF
   end
 
-  def command(encoded_region_a_name, encoded_region_b_name, force = 
'false')
-admin.merge_region(encoded_region_a_name, encoded_region_b_name, force)
+  def command(region_a_name, region_b_name, force = 'false')
+admin.merge_region(region_a_name, region_b_name, force)
   end
 end
   end

hbase git commit: HBASE-20254 Incorrect help message for merge_region

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 2edced386 -> 364fe930c


HBASE-20254 Incorrect help message for merge_region


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

Branch: refs/heads/branch-2.0
Commit: 364fe930ceb4bc2a4697b6f69e06b38e860446ce
Parents: 2edced3
Author: Peter Somogyi 
Authored: Thu Mar 22 16:55:21 2018 +0100
Committer: Peter Somogyi 
Committed: Mon Mar 26 19:53:37 2018 +0200

--
 hbase-shell/src/main/ruby/hbase/admin.rb |  6 --
 hbase-shell/src/main/ruby/shell/commands/merge_region.rb | 10 ++
 2 files changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/364fe930/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index f35dcb0..e409e39 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -468,8 +468,10 @@ module Hbase
 
 
#--
 # Merge two regions
-def merge_region(encoded_region_a_name, encoded_region_b_name, force)
-  @admin.mergeRegions(encoded_region_a_name.to_java_bytes, 
encoded_region_b_name.to_java_bytes, java.lang.Boolean.valueOf(force))
+def merge_region(region_a_name, region_b_name, force)
+  @admin.mergeRegions(region_a_name.to_java_bytes,
+  region_b_name.to_java_bytes,
+  java.lang.Boolean.valueOf(force))
 end
 
 
#--

http://git-wip-us.apache.org/repos/asf/hbase/blob/364fe930/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb 
b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
index 9c66770..b4f6cae 100644
--- a/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/merge_region.rb
@@ -26,21 +26,23 @@ Merge two regions. Passing 'true' as the optional third 
parameter will force
 a merge ('force' merges regardless else merge will fail unless passed
 adjacent regions. 'force' is for expert use only).
 
-NOTE: You must pass the encoded region name, not the full region name so
-this command is a little different from other region operations.  The encoded
+You can pass the encoded region name or the full region name.  The encoded
 region name is the hash suffix on region names: e.g. if the region name were
 TestTable,0094429456,1289497600452.527db22f95c8a9e0116f0cc13c680396. then
 the encoded region name portion is 527db22f95c8a9e0116f0cc13c680396
 
 Examples:
 
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME'
+  hbase> merge_region 'FULL_REGIONNAME', 'FULL_REGIONNAME', true
+
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME'
   hbase> merge_region 'ENCODED_REGIONNAME', 'ENCODED_REGIONNAME', true
 EOF
   end
 
-  def command(encoded_region_a_name, encoded_region_b_name, force = 
'false')
-admin.merge_region(encoded_region_a_name, encoded_region_b_name, force)
+  def command(region_a_name, region_b_name, force = 'false')
+admin.merge_region(region_a_name, region_b_name, force)
   end
 end
   end

hbase git commit: HBASE-20313 Canary documentation is incorrect in reference guide

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master d57001ee2 -> c8dff328c


HBASE-20313 Canary documentation is incorrect in reference guide


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

Branch: refs/heads/master
Commit: c8dff328cb39e5a3a5a42c6b73fca7af707a0bcb
Parents: d57001e
Author: Peter Somogyi 
Authored: Thu Mar 29 13:18:17 2018 +0200
Committer: Peter Somogyi 
Committed: Sat Mar 31 12:06:45 2018 +0200

--
 src/main/asciidoc/_chapters/ops_mgt.adoc | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c8dff328/src/main/asciidoc/_chapters/ops_mgt.adoc
--
diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc 
b/src/main/asciidoc/_chapters/ops_mgt.adoc
index bb2b41a..10b9d00 100644
--- a/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -79,7 +79,7 @@ Others, such as `hbase shell` (<>), `hbase upgrade` 
(<>), and
 === Canary
 
 There is a Canary class can help users to canary-test the HBase cluster 
status, with every column-family for every regions or RegionServer's 
granularity.
-To see the usage, use the `--help` parameter.
+To see the usage, use the `-help` parameter.
 
 
 $ ${HBASE_HOME}/bin/hbase canary -help
@@ -192,10 +192,10 @@ This daemon will stop itself and return non-zero error 
code if any error occurs,
 $ ${HBASE_HOME}/bin/hbase canary -daemon
 
 
-Run repeatedly with internal 5 seconds and will not stop itself even if errors 
occur in the test.
+Run repeatedly with 5 second intervals and will not stop itself even if errors 
occur in the test.
 
 
-$ ${HBASE_HOME}/bin/hbase canary -daemon -interval 5 -f false
+$ ${HBASE_HOME}/bin/hbase canary -daemon -interval 5 -f false
 
 
  Force timeout if canary test stuck
@@ -205,7 +205,7 @@ Because of this we provide a timeout option to kill the 
canary test and return a
 This run sets the timeout value to 60 seconds, the default value is 600 
seconds.
 
 
-$ ${HBASE_HOME}/bin/hbase canary -t 60
+$ ${HBASE_HOME}/bin/hbase canary -t 6
 
 
  Enable write sniffing in canary
@@ -234,7 +234,7 @@ while returning normal exit code. To treat read / write 
failure as error, you ca
 with the `-treatFailureAsError` option. When enabled, read / write failure 
would result in error
 exit code.
 
-$ ${HBASE_HOME}/bin/hbase canary --treatFailureAsError
+$ ${HBASE_HOME}/bin/hbase canary -treatFailureAsError
 
 
  Running Canary in a Kerberos-enabled Cluster
@@ -266,7 +266,7 @@ This example shows each of the properties with valid values.
   /etc/hbase/conf/keytab.krb5
 
 
-property>
+
   hbase.client.dns.interface
   default
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 3791d2e20 -> 42f5b2723


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-1.3
Commit: 42f5b2723f0035861ffc007f00feef3f8ec0d21e
Parents: 3791d2e
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Mar 28 10:13:09 2018 +0200

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/42f5b272/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 3ce3d06..037630f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
   return <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-20256 Document commands that do not work with 1.2 shell

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 87ab7e712 -> aed7834dd


HBASE-20256 Document commands that do not work with 1.2 shell


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

Branch: refs/heads/master
Commit: aed7834dd11f294e1d28ce9feed7362973fe8328
Parents: 87ab7e7
Author: Peter Somogyi 
Authored: Wed Mar 28 10:37:47 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Apr 4 09:13:14 2018 +0200

--
 src/main/asciidoc/_chapters/upgrading.adoc | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/aed7834d/src/main/asciidoc/_chapters/upgrading.adoc
--
diff --git a/src/main/asciidoc/_chapters/upgrading.adoc 
b/src/main/asciidoc/_chapters/upgrading.adoc
index acabf6c..38a67d4 100644
--- a/src/main/asciidoc/_chapters/upgrading.adoc
+++ b/src/main/asciidoc/_chapters/upgrading.adoc
@@ -446,6 +446,16 @@ The following permission related changes either altered 
semantics or defaults:
 
 A number of admin commands are known to not work when used from a pre-HBase 
2.0 client. This includes an HBase Shell that has the library jars from 
pre-HBase 2.0. You will need to plan for an outage of use of admin APIs and 
commands until you can also update to the needed client version.
 
+The following client operations do not work against HBase 2.0+ cluster when 
executed from a pre-HBase 2.0 client:
+
+* list_procedures
+* split
+* merge_region
+* list_quotas
+* enable_table_replication
+* disable_table_replication
+* Snapshot related commands
+
 .Deprecated in 1.0 admin commands have been removed.
 
 The following commands that were deprecated in 1.0 have been removed. Where 
applicable the replacement command is listed.

hbase git commit: HBASE-19890 Canary usage should document hbase.canary.sink.class config

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 7abaf22a1 -> 87ab7e712


HBASE-19890 Canary usage should document hbase.canary.sink.class config


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

Branch: refs/heads/master
Commit: 87ab7e712df4b9c9b24665488a69190310e747d9
Parents: 7abaf22
Author: Peter Somogyi 
Authored: Tue Apr 3 10:44:29 2018 +0200
Committer: Peter Somogyi 
Committed: Wed Apr 4 09:08:31 2018 +0200

--
 src/main/asciidoc/_chapters/ops_mgt.adoc | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/87ab7e71/src/main/asciidoc/_chapters/ops_mgt.adoc
--
diff --git a/src/main/asciidoc/_chapters/ops_mgt.adoc 
b/src/main/asciidoc/_chapters/ops_mgt.adoc
index 8d49ef8..ce327fa 100644
--- a/src/main/asciidoc/_chapters/ops_mgt.adoc
+++ b/src/main/asciidoc/_chapters/ops_mgt.adoc
@@ -108,6 +108,13 @@ Usage: hbase canary [opts] [table1 [table2]...] | 
[regionserver1 [regionserver2]
-D= assigning or override the configuration params
 
 
+[NOTE]
+The `Sink` class is instantiated using the `hbase.canary.sink.class` 
configuration property which
+will also determine the used Monitor class. In the absence of this property 
RegionServerStdOutSink
+will be used. You need to use the Sink according to the passed parameters to 
the _canary_ command.
+As an example you have to set `hbase.canary.sink.class` property to
+`org.apache.hadoop.hbase.tool.Canary$RegionStdOutSink` for using table 
parameters.
+
 This tool will return non zero error codes to user for collaborating with 
other monitoring tools, such as Nagios.
 The error code definitions are:
 

hbase git commit: HBASE-20328 Fix local backup master start command in documentation

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master aed7834dd -> 0c0fe05bc


HBASE-20328 Fix local backup master start command in documentation

Signed-off-by: Umesh Agashe 


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

Branch: refs/heads/master
Commit: 0c0fe05bc410bcfcccaa19d4be96834cc28f9317
Parents: aed7834
Author: Yuki Tawara 
Authored: Tue Apr 3 00:10:42 2018 +0900
Committer: Peter Somogyi 
Committed: Wed Apr 4 10:06:19 2018 +0200

--
 src/main/asciidoc/_chapters/getting_started.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0c0fe05b/src/main/asciidoc/_chapters/getting_started.adoc
--
diff --git a/src/main/asciidoc/_chapters/getting_started.adoc 
b/src/main/asciidoc/_chapters/getting_started.adoc
index 1cdc0a2..47e0d96 100644
--- a/src/main/asciidoc/_chapters/getting_started.adoc
+++ b/src/main/asciidoc/_chapters/getting_started.adoc
@@ -371,7 +371,7 @@ The following command starts 3 backup servers using ports 
16002/16012, 16003/160
 +
 
 
-$ ./bin/local-master-backup.sh 2 3 5
+$ ./bin/local-master-backup.sh start 2 3 5
 
 +
 To kill a backup master without killing the entire cluster, you need to find 
its process ID (PID). The PID is stored in a file with a name like 
_/tmp/hbase-USER-X-master.pid_.

hbase git commit: HBASE-20241 splitormerge_enabled does not work

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 dd9e46bbf -> c20a2a467


HBASE-20241 splitormerge_enabled does not work

Signed-off-by: Ted Yu 


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

Branch: refs/heads/branch-2
Commit: c20a2a4673cef9c107c594e9eca7bb86ea96ae14
Parents: dd9e46b
Author: Peter Somogyi 
Authored: Wed Mar 21 14:20:27 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 22 11:59:23 2018 +0100

--
 hbase-shell/src/main/ruby/hbase/admin.rb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c20a2a46/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index 078477f..f35dcb0 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -142,9 +142,9 @@ module Hbase
 def splitormerge_switch(type, enabled)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end
@@ -160,9 +160,9 @@ module Hbase
 def splitormerge_enabled(type)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end

hbase git commit: HBASE-20241 splitormerge_enabled does not work

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 70c170727 -> 05889089d


HBASE-20241 splitormerge_enabled does not work

Signed-off-by: Ted Yu 


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

Branch: refs/heads/branch-2.0
Commit: 05889089dc5d83f3b695aa882898ced6a3f9fdbe
Parents: 70c1707
Author: Peter Somogyi 
Authored: Wed Mar 21 14:20:27 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 22 12:03:27 2018 +0100

--
 hbase-shell/src/main/ruby/hbase/admin.rb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/05889089/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index 078477f..f35dcb0 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -142,9 +142,9 @@ module Hbase
 def splitormerge_switch(type, enabled)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end
@@ -160,9 +160,9 @@ module Hbase
 def splitormerge_enabled(type)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end

hbase git commit: HBASE-20241 splitormerge_enabled does not work

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master a6eeb26cc -> e2fc21e4a


HBASE-20241 splitormerge_enabled does not work

Signed-off-by: Ted Yu 


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

Branch: refs/heads/master
Commit: e2fc21e4a1b0b854a49b94ff2c1627da3be4fbc4
Parents: a6eeb26
Author: Peter Somogyi 
Authored: Wed Mar 21 14:20:27 2018 +0100
Committer: Peter Somogyi 
Committed: Thu Mar 22 11:58:35 2018 +0100

--
 hbase-shell/src/main/ruby/hbase/admin.rb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/e2fc21e4/hbase-shell/src/main/ruby/hbase/admin.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb 
b/hbase-shell/src/main/ruby/hbase/admin.rb
index 078477f..f35dcb0 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -142,9 +142,9 @@ module Hbase
 def splitormerge_switch(type, enabled)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end
@@ -160,9 +160,9 @@ module Hbase
 def splitormerge_enabled(type)
   switch_type = nil
   if type == 'SPLIT'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::SPLIT
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::SPLIT
   elsif type == 'MERGE'
-switch_type = 
org.apache.hadoop.hbase.client.Admin::MasterSwitchType::MERGE
+switch_type = org.apache.hadoop.hbase.client::MasterSwitchType::MERGE
   else
 raise ArgumentError, 'only SPLIT or MERGE accepted for type!'
   end

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 23d373db3 -> 4df0b4f0e


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-2.0
Commit: 4df0b4f0e1356dac989404721f0774702c027428
Parents: 23d373d
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:27:15 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4df0b4f0/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 0f3e78d..c7b3aab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
 <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 705d15038 -> 489e875a7


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-2
Commit: 489e875a780612295cd3b1fe91d61d513dd81bd1
Parents: 705d150
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:26:35 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/489e875a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 0f3e78d..c7b3aab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
 <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 3340618b4 -> 0827b300f


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-1.2
Commit: 0827b300fc6bf007cc01ff147ec69c3ff5987a00
Parents: 3340618
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:35:47 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0827b300/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 3ce3d06..037630f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
   return <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/master 64061f896 -> cd5a821c7


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/master
Commit: cd5a821c75c77aa7f6070db78d852373b57c1185
Parents: 64061f8
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:25:56 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cd5a821c/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 0f3e78d..c7b3aab 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
 <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 2a8e62f8e -> 9224cead8


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-1
Commit: 9224cead8626b94b92d4d4383a5f31481d783934
Parents: 2a8e62f
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:27:44 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9224cead/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 3ce3d06..037630f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
   return <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 172373d1f -> c6fe80b98


HBASE-16848 Usage for show_peer_tableCFs command doesn't include peer


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

Branch: refs/heads/branch-1.4
Commit: c6fe80b98139e6cc2411bcd71b7239d9885c95f6
Parents: 172373d
Author: Peter Somogyi 
Authored: Thu Mar 22 16:22:38 2018 +0100
Committer: Peter Somogyi 
Committed: Fri Mar 23 16:28:14 2018 +0100

--
 hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c6fe80b9/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb 
b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
index 3ce3d06..037630f 100644
--- a/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/show_peer_tableCFs.rb
@@ -25,7 +25,7 @@ module Shell
   return <<-EOF
   Show replicable table-cf config for the specified peer.
 
-hbase> show_peer_tableCFs
+hbase> show_peer_tableCFs '2'
   EOF
   end
 

hbase git commit: HBASE-21547 Precommit uses master flaky list for other branches

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.1 1dfc418f7 -> 8923b0e17


HBASE-21547 Precommit uses master flaky list for other branches

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-2.1
Commit: 8923b0e170876dbc9595629a0fd3403fd8308003
Parents: 1dfc418
Author: Peter Somogyi 
Authored: Fri Dec 28 15:16:48 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Jan 2 08:34:58 2019 +0100

--
 dev-support/hbase-personality.sh | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8923b0e1/dev-support/hbase-personality.sh
--
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index ac2f60b..00ccb45 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -271,6 +271,20 @@ function get_include_exclude_tests_arg
 yetus_error "Wget error $? in fetching includes file from url" \
  "${INCLUDE_TESTS_URL}. Ignoring and proceeding."
   fi
+  else
+# Use branch specific exclude list when EXCLUDE_TESTS_URL and 
INCLUDE_TESTS_URL are empty
+
FLAKY_URL="https://builds.apache.org/job/HBase-Find-Flaky-Tests/job/${PATCH_BRANCH}/lastSuccessfulBuild/artifact/excludes/;
+if wget "${FLAKY_URL}" -O "excludes"; then
+  excludes=$(cat excludes)
+yetus_debug "excludes=${excludes}"
+if [[ -n "${excludes}" ]]; then
+  eval "${__resultvar}='-Dtest.exclude.pattern=${excludes}'"
+fi
+rm excludes
+  else
+yetus_error "Wget error $? in fetching excludes file from url" \
+ "${FLAKY_URL}. Ignoring and proceeding."
+  fi
   fi
 }
 

hbase git commit: HBASE-21547 Precommit uses master flaky list for other branches

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 beeb0796e -> f9afd9254


HBASE-21547 Precommit uses master flaky list for other branches

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-1
Commit: f9afd925482a662033fbe959ab746f1f0ea1a7e1
Parents: beeb079
Author: Peter Somogyi 
Authored: Fri Dec 28 15:16:48 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Jan 2 08:41:46 2019 +0100

--
 dev-support/hbase-personality.sh | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/f9afd925/dev-support/hbase-personality.sh
--
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 93727b3..7f930d0 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -259,6 +259,20 @@ function get_include_exclude_tests_arg
 yetus_error "Wget error $? in fetching includes file from url" \
  "${INCLUDE_TESTS_URL}. Ignoring and proceeding."
   fi
+  else
+# Use branch specific exclude list when EXCLUDE_TESTS_URL and 
INCLUDE_TESTS_URL are empty
+
FLAKY_URL="https://builds.apache.org/job/HBase-Find-Flaky-Tests/job/${PATCH_BRANCH}/lastSuccessfulBuild/artifact/excludes/;
+if wget "${FLAKY_URL}" -O "excludes"; then
+  excludes=$(cat excludes)
+yetus_debug "excludes=${excludes}"
+if [[ -n "${excludes}" ]]; then
+  eval "${__resultvar}='-Dtest.exclude.pattern=${excludes}'"
+fi
+rm excludes
+  else
+yetus_error "Wget error $? in fetching excludes file from url" \
+ "${FLAKY_URL}. Ignoring and proceeding."
+  fi
   fi
 }
 

hbase git commit: HBASE-21547 Precommit uses master flaky list for other branches

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2.0 205e39c57 -> c2c38a637


HBASE-21547 Precommit uses master flaky list for other branches

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-2.0
Commit: c2c38a63708415cb4258206ab29f1dd84f3c5875
Parents: 205e39c
Author: Peter Somogyi 
Authored: Fri Dec 28 15:16:48 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Jan 2 08:38:36 2019 +0100

--
 dev-support/hbase-personality.sh | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c2c38a63/dev-support/hbase-personality.sh
--
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 7192041..ba5bc37 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -259,6 +259,20 @@ function get_include_exclude_tests_arg
 yetus_error "Wget error $? in fetching includes file from url" \
  "${INCLUDE_TESTS_URL}. Ignoring and proceeding."
   fi
+  else
+# Use branch specific exclude list when EXCLUDE_TESTS_URL and 
INCLUDE_TESTS_URL are empty
+
FLAKY_URL="https://builds.apache.org/job/HBase-Find-Flaky-Tests/job/${PATCH_BRANCH}/lastSuccessfulBuild/artifact/excludes/;
+if wget "${FLAKY_URL}" -O "excludes"; then
+  excludes=$(cat excludes)
+yetus_debug "excludes=${excludes}"
+if [[ -n "${excludes}" ]]; then
+  eval "${__resultvar}='-Dtest.exclude.pattern=${excludes}'"
+fi
+rm excludes
+  else
+yetus_error "Wget error $? in fetching excludes file from url" \
+ "${FLAKY_URL}. Ignoring and proceeding."
+  fi
   fi
 }
 

hbase git commit: HBASE-21547 Precommit uses master flaky list for other branches

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 ba9a49b8a -> 0b086087b


HBASE-21547 Precommit uses master flaky list for other branches

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-2
Commit: 0b086087b26eabd85bd1c47a1f62338608d7532a
Parents: ba9a49b
Author: Peter Somogyi 
Authored: Fri Dec 28 15:16:48 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Jan 2 08:31:06 2019 +0100

--
 dev-support/hbase-personality.sh | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0b086087/dev-support/hbase-personality.sh
--
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index ac2f60b..00ccb45 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -271,6 +271,20 @@ function get_include_exclude_tests_arg
 yetus_error "Wget error $? in fetching includes file from url" \
  "${INCLUDE_TESTS_URL}. Ignoring and proceeding."
   fi
+  else
+# Use branch specific exclude list when EXCLUDE_TESTS_URL and 
INCLUDE_TESTS_URL are empty
+
FLAKY_URL="https://builds.apache.org/job/HBase-Find-Flaky-Tests/job/${PATCH_BRANCH}/lastSuccessfulBuild/artifact/excludes/;
+if wget "${FLAKY_URL}" -O "excludes"; then
+  excludes=$(cat excludes)
+yetus_debug "excludes=${excludes}"
+if [[ -n "${excludes}" ]]; then
+  eval "${__resultvar}='-Dtest.exclude.pattern=${excludes}'"
+fi
+rm excludes
+  else
+yetus_error "Wget error $? in fetching excludes file from url" \
+ "${FLAKY_URL}. Ignoring and proceeding."
+  fi
   fi
 }
 

hbase git commit: HBASE-21547 Precommit uses master flaky list for other branches

[psomogyi]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 f7470a8b5 -> 928baae11


HBASE-21547 Precommit uses master flaky list for other branches

Signed-off-by: Sean Busbey 


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

Branch: refs/heads/branch-1.4
Commit: 928baae115f90c9beabeceeb0ed41db4afec29b0
Parents: f7470a8
Author: Peter Somogyi 
Authored: Fri Dec 28 15:16:48 2018 +0100
Committer: Peter Somogyi 
Committed: Wed Jan 2 08:43:24 2019 +0100

--
 dev-support/hbase-personality.sh | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/928baae1/dev-support/hbase-personality.sh
--
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index 6c99839..705d775 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -259,6 +259,20 @@ function get_include_exclude_tests_arg
 yetus_error "Wget error $? in fetching includes file from url" \
  "${INCLUDE_TESTS_URL}. Ignoring and proceeding."
   fi
+  else
+# Use branch specific exclude list when EXCLUDE_TESTS_URL and 
INCLUDE_TESTS_URL are empty
+
FLAKY_URL="https://builds.apache.org/job/HBase-Find-Flaky-Tests/job/${PATCH_BRANCH}/lastSuccessfulBuild/artifact/excludes/;
+if wget "${FLAKY_URL}" -O "excludes"; then
+  excludes=$(cat excludes)
+yetus_debug "excludes=${excludes}"
+if [[ -n "${excludes}" ]]; then
+  eval "${__resultvar}='-Dtest.exclude.pattern=${excludes}'"
+fi
+rm excludes
+  else
+yetus_error "Wget error $? in fetching excludes file from url" \
+ "${FLAKY_URL}. Ignoring and proceeding."
+  fi
   fi
 }