Repository: hbase Updated Branches: refs/heads/master a6eeb26cc -> e2fc21e4a
HBASE-20241 splitormerge_enabled does not work Signed-off-by: Ted Yu <yuzhih...@gmail.com> 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 <psomo...@apache.org> Authored: Wed Mar 21 14:20:27 2018 +0100 Committer: Peter Somogyi <psomo...@apache.org> 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