Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/hbase
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e6f8f6db Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e6f8f6db Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e6f8f6db Branch: refs/heads/master Commit: e6f8f6dbd0f7e801fd0fbafbe8cb35492bf08285 Parents: 156a8b2 1d6c90b Author: anoopsamjohn <anoopsamj...@gmail.com> Authored: Thu Sep 15 18:07:12 2016 +0530 Committer: anoopsamjohn <anoopsamj...@gmail.com> Committed: Thu Sep 15 18:07:12 2016 +0530 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/Admin.java | 5 +- .../hadoop/hbase/client/AsyncProcess.java | 4 +- .../apache/hadoop/hbase/client/HBaseAdmin.java | 6 +- .../hadoop/hbase/ipc/AbstractRpcClient.java | 22 ++++ .../hbase/ipc/ServerTooBusyException.java | 38 ++++++ .../org/apache/hadoop/hbase/HConstants.java | 12 ++ .../java/org/apache/hadoop/hbase/KeyValue.java | 15 ++- .../src/main/resources/hbase-default.xml | 16 ++- .../AbstractStateMachineNamespaceProcedure.java | 70 +++++++++++ .../AbstractStateMachineTableProcedure.java | 111 +++++++++++++++++ .../procedure/AddColumnFamilyProcedure.java | 38 ++---- .../procedure/CloneSnapshotProcedure.java | 30 +---- .../procedure/CreateNamespaceProcedure.java | 28 +---- .../master/procedure/CreateTableProcedure.java | 43 ++----- .../procedure/DeleteColumnFamilyProcedure.java | 38 ++---- .../procedure/DeleteNamespaceProcedure.java | 34 +----- .../master/procedure/DeleteTableProcedure.java | 49 ++------ .../master/procedure/DisableTableProcedure.java | 55 ++------- .../DispatchMergingRegionsProcedure.java | 16 +-- .../master/procedure/EnableTableProcedure.java | 55 ++------- .../procedure/MasterDDLOperationHelper.java | 16 --- .../procedure/ModifyColumnFamilyProcedure.java | 38 ++---- .../procedure/ModifyNamespaceProcedure.java | 34 +----- .../master/procedure/ModifyTableProcedure.java | 44 ++----- .../procedure/RestoreSnapshotProcedure.java | 27 +---- .../procedure/TruncateTableProcedure.java | 36 ++---- .../org/apache/hadoop/hbase/client/TestHCM.java | 119 ++++++++++++++++++- .../TestScannerHeartbeatMessages.java | 105 +++++++--------- hbase-shell/src/main/ruby/hbase/security.rb | 9 +- hbase-shell/src/main/ruby/hbase/table.rb | 81 +++++++++---- .../src/main/ruby/shell/commands/deleteall.rb | 17 ++- hbase-shell/src/test/ruby/hbase/table_test.rb | 12 ++ src/main/asciidoc/_chapters/developer.adoc | 60 ++++++---- 33 files changed, 677 insertions(+), 606 deletions(-) ----------------------------------------------------------------------
