You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/03/24 09:12:50 UTC

[hbase] branch HBASE-22120 updated (6f72d03 -> e5e6c47)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a change to branch HBASE-22120
in repository https://gitbox.apache.org/repos/asf/hbase.git.


 discard 6f72d03  HBASE-25616 Upgrade opentelemetry to 1.0.0 (#3034)
 discard 3aabc2e  HBASE-25617 Revisit the span names (#2998)
 discard e4c1b1a  HBASE-25591 Upgrade opentelemetry to 0.17.1 (#2971)
 discard 534f87a  HBASE-25535 Set span kind to CLIENT in AbstractRpcClient (#2907)
 discard 7105111  HBASE-25484 Add trace support for WAL sync (#2892)
 discard cc36e7b  HBASE-25455 Add trace support for HRegion read/write operation (#2861)
 discard b6621a2  HBASE-25481 Add host and port attribute when tracing rpc call at client side (#2857)
 discard 6268a32  HBASE-25454 Add trace support for connection registry (#2828)
 discard 5a96f0a  HBASE-23898 Add trace support for simple apis in async client (#2813)
 discard 89eb1d4  HBASE-25424 Find a way to config OpenTelemetry tracing without direct… (#2808)
 discard 1be0ff0  HBASE-25401 Add trace support for async call in rpc client (#2790)
 discard 56992ca  HBASE-25373 Remove HTrace completely in code base and try to make use of OpenTelemetry
     add 95342a2  HBASE-25654 [Documentation] Fix format error in security.adoc
     add 373dc77  HBASE-25548 Optionally allow snapshots to preserve cluster's max file… (#2923)
     add d79019b  HBASE-25629 Reimplement TestCurrentHourProvider to not depend on unstable TZs (#3013)
     add 0e6c2c4  HBASE-25636 Expose HBCK report as metrics (#3031)
     add 0cc1ae4  HBASE-25587 [hbck2] Schedule SCP for all unknown servers (#2978)
     add cc61714  HBASE-25566 RoundRobinTableInputFormat (#2947)
     add 1a69a52  HBASE-25570 On largish cluster, "CleanerChore: Could not delete dir..." makes master log unreadable (#2949)
     add 7386fb6  HBASE-25622 Result#compareResults should compare tags. (#3026)
     add 876fec1  HBASE-25657 Fix spotbugs warnings after upgrading spotbugs to 4.x (#3041)
     add aeec8ca  HBASE-25635 CandidateGenerator may miss some region balance actions (#3024)
     add 8337fb2  HBASE-25662 Fix spotbugs warning in RoundRobinTableInputFormat (#3050)
     add f4e1ab7  HBASE-25663 Make graceful_stop localhostname compare match even if fqdn (#3048)
     add 630f47e   HBASE-25660 Print split policy in use on Region open (as well as split policy vitals) (#3044)
     add 21409bf  HBASE-25573 release script generated vote template has incorrect staging area (#2952)
     add 625bea3  HBASE-25595 TestLruBlockCache.testBackgroundEvictionThread is flaky (#2974)
     add 0ef892b  HBASE-25621 Balancer should check region plan source to avoid misplace region groups (#3002)
     add db2e6d8  HBASE-25597 Add row info in Exception when cell size exceeds maxCellSize (#2976)
     add 5457554  HBASE-25374 Make REST Client connection and socket time out configurable (#2752)
     add c36e40e  Revert "HBASE-25663 Make graceful_stop localhostname compare match even if fqdn (#3048)"
     add 59ec375  HBASE-25594 graceful_stop.sh fails to unload regions when ran at localhost
     add d74ae15  HBASE-25568 Upgrade Thrift jar to fix CVE-2020-13949 (#3043)
     add 75931b4  HBASE-25669 Fix typo of hbase.mob.compaction.chore.period in the docs (#3056)
     add ebb0adf  HBASE-25665 Option to use hostname instead of canonical hostname for secure HBase cluster connection (#3051)
     add bcf503e  HBASE-25653 Add units and round off region size to 2 digits after decimal (#3046)
     add 976629c  HBASE-25608 Support HFileOutputFormat locality sensitive even destination cluster is different from source cluster (#2988)
     add ff38218  HBASE-25627: HBase replication should have a metric to represent if the source is stuck getting initialized (#3018)
     add d200a67  Update 2.4.x download link to release 2.4.2
     add a698b1e  HBASE-25673 Wrong log regarding current active master at ZKLeaderManager#waitToBecomeLeader (#3057)
     add 7ac1c8b  HBASE-25677 Server+table counters on each scan #nextRaw invocation becomes a bottleneck when heavy load (#3061)
     add 3ebb978  HBASE-25674 - RegionInfo.parseFrom(DataInputStream) sometimes fails to read the protobuf magic marker (#3062)
     add 0cead10  HBOPS-25594 Make easier to use graceful_stop on localhost mode (#3054)
     add d93035a  HBASE-25643 The delayed FlushRegionEntry should be removed when we ne… (#3049)
     add 585aca1  HBASE-25518 Support separate child regions to different region servers (#3001)
     add 82dfa27  Revert "HBOPS-25594 Make easier to use graceful_stop on localhost mode (#3054)"
     add cc6c14a  HBASE-25594 Make easier to use graceful_stop on localhost mode (#3054)
     add f405990  HBASE-25678 Support nonce operations for Increment/Append in RowMutations and CheckAndMutate (#3064)
     add fea4bd1  HBASE-25679 Size of log queue metric is incorrect (#3071)
     add a3938c8  HBASE-25681 Add a switch for server/table queryMeter (#3070)
     add ba3610d  HBASE-19577 Use log4j2 instead of log4j for logging (#1708)
     add 326835e  HBASE-25594 Make easier to use graceful_stop on localhost mode (#3054) Addendum.
     add 3358091  HBASE-25683 Simplify UTs using DummyServer (#3069)
     add b8a03d7  HBASE-25689 Nightly client integration test is failing after upgrading to log4j2 (#3077)
     add 87d0533  HBASE-25688 Use CustomRequestLog instead of Slf4jRequestLog for jetty (#3075)
     add 202b17f  HBASE-25685 asyncprofiler2.0 no longer supports svg; wants html (#3079)
     add 5e2853c  HBASE-25373 Remove HTrace completely in code base and try to make use of OpenTelemetry
     add 55c8861  HBASE-25401 Add trace support for async call in rpc client (#2790)
     add be0ec6f  HBASE-25424 Find a way to config OpenTelemetry tracing without direct… (#2808)
     add e6af042  HBASE-23898 Add trace support for simple apis in async client (#2813)
     add 7f9a606  HBASE-25454 Add trace support for connection registry (#2828)
     add 22cd449  HBASE-25481 Add host and port attribute when tracing rpc call at client side (#2857)
     add cffb002  HBASE-25455 Add trace support for HRegion read/write operation (#2861)
     add 85a5785  HBASE-25484 Add trace support for WAL sync (#2892)
     add 9d05550  HBASE-25535 Set span kind to CLIENT in AbstractRpcClient (#2907)
     add 152d14b  HBASE-25591 Upgrade opentelemetry to 0.17.1 (#2971)
     add df1608b  HBASE-25617 Revisit the span names (#2998)
     add e5e6c47  HBASE-25616 Upgrade opentelemetry to 1.0.0 (#3034)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (6f72d03)
            \
             N -- N -- N   refs/heads/HBASE-22120 (e5e6c47)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 bin/graceful_stop.sh                               |    9 +-
 bin/hbase                                          |   25 +-
 bin/hbase-daemon.sh                                |   16 +-
 bin/hbase.cmd                                      |   16 +-
 conf/log4j-hbtop.properties                        |   27 -
 conf/log4j.properties                              |  139 ---
 .../hbase-site.xml => conf/log4j2-hbtop.xml        |   29 +-
 conf/log4j2.xml                                    |  105 ++
 dev-support/create-release/release-build.sh        |   10 +-
 dev-support/create-release/vote.tmpl               |    2 +-
 .../hbase_nightly_pseudo-distributed-test.sh       |   38 +-
 hbase-archetypes/hbase-client-project/pom.xml      |   18 +-
 .../src/main/resources/log4j.properties            |  121 ---
 .../src/main/resources/log4j2.xml                  |  103 ++
 .../hbase-shaded-client-project/pom.xml            |   18 +-
 .../src/main/resources/log4j.properties            |  121 ---
 .../src/main/resources/log4j2.xml                  |  103 ++
 hbase-assembly/pom.xml                             |   16 +-
 hbase-assembly/src/main/assembly/client.xml        |   12 +-
 .../src/main/assembly/hadoop-three-compat.xml      |   12 +-
 hbase-asyncfs/pom.xml                              |   18 +-
 .../hadoop/hbase/io/asyncfs/AsyncFSTestBase.java   |    6 +-
 hbase-backup/pom.xml                               |   18 +-
 hbase-balancer/pom.xml                             |   13 +-
 hbase-client/pom.xml                               |   13 +-
 .../hbase/client/AsyncBatchRpcRetryingCaller.java  |   22 +-
 .../org/apache/hadoop/hbase/client/HBaseHbck.java  |   16 +
 .../java/org/apache/hadoop/hbase/client/Hbck.java  |    2 +
 .../hadoop/hbase/client/RawAsyncTableImpl.java     |   56 +-
 .../org/apache/hadoop/hbase/client/RegionInfo.java |    4 +-
 .../org/apache/hadoop/hbase/client/Result.java     |    3 +-
 .../hadoop/hbase/client/SnapshotDescription.java   |   14 +-
 .../GssSaslClientAuthenticationProvider.java       |   30 +-
 .../hadoop/hbase/shaded/protobuf/ProtobufUtil.java |    4 +
 .../hbase/shaded/protobuf/RequestConverter.java    |  138 ++-
 .../hadoop/hbase/ipc/TestFailedServersLog.java     |   67 +-
 .../hbase/security/TestHBaseSaslRpcClient.java     |   14 +-
 hbase-common/pom.xml                               |   13 +-
 .../java/org/apache/hadoop/hbase/CellUtil.java     |    4 +
 .../java/org/apache/hadoop/hbase/HConstants.java   |   15 +
 .../org/apache/hadoop/hbase/PrivateCellUtil.java   |   25 +
 .../hadoop/hbase/security/SecurityConstants.java   |   14 +-
 hbase-common/src/main/resources/hbase-default.xml  |    8 +
 .../hadoop/hbase/logging/TestLog4jUtils.java       |   39 +-
 hbase-endpoint/pom.xml                             |   18 +-
 hbase-examples/README.txt                          |    2 +-
 hbase-examples/pom.xml                             |   18 +-
 .../apache/hadoop/hbase/thrift2/DemoClient.java    |    5 +-
 hbase-hadoop-compat/pom.xml                        |  324 +++---
 .../master/MetricsAssignmentManagerSource.java     |   70 ++
 .../master/MetricsAssignmentManagerSourceImpl.java |   58 ++
 .../hbase/regionserver/MetricsTableQueryMeter.java |    3 +
 .../regionserver/MetricsTableQueryMeterImpl.java   |    3 -
 .../MetricsReplicationGlobalSourceSourceImpl.java  |   20 +-
 .../MetricsReplicationSourceSource.java            |    7 +-
 .../MetricsReplicationSourceSourceImpl.java        |   21 +
 .../metrics2/lib/DynamicMetricsRegistry.java       |   36 +-
 .../hadoop/hbase/test/MetricsAssertHelper.java     |   10 +
 .../hadoop/hbase/test/MetricsAssertHelperImpl.java |   11 +-
 hbase-hbtop/pom.xml                                |   13 +-
 hbase-http/pom.xml                                 |   13 +-
 .../apache/hadoop/hbase/http/HttpRequestLog.java   |    9 +-
 .../apache/hadoop/hbase/http/ProfileServlet.java   |   13 +-
 .../org/apache/hadoop/hbase/http/log/LogLevel.java |    4 +-
 .../apache/hadoop/hbase/util/LogMonitoring.java    |    8 +-
 .../hadoop/hbase/http/TestHttpRequestLog.java      |   10 +-
 .../apache/hadoop/hbase/http/log/TestLogLevel.java |  199 ++--
 hbase-it/pom.xml                                   |   18 +-
 hbase-logging/pom.xml                              |   28 +-
 .../apache/hadoop/hbase/AsyncConsoleAppender.java  |   46 -
 .../hadoop/hbase/logging/InternalLog4jUtils.java   |   58 +-
 .../test/java/org/apache/log4j/FileAppender.java   |  288 ++++++
 hbase-logging/src/test/resources/log4j.properties  |   68 --
 hbase-logging/src/test/resources/log4j2.xml        |   45 +
 hbase-mapreduce/pom.xml                            |   18 +-
 .../hadoop/hbase/mapreduce/HFileOutputFormat2.java |   72 +-
 .../mapreduce/RoundRobinTableInputFormat.java      |  172 ++++
 .../hadoop/hbase/mapreduce/TableMapReduceUtil.java |   16 +-
 .../apache/hadoop/hbase/mapreduce/TableSplit.java  |   14 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java    |  201 ++++
 .../mapreduce/TestRoundRobinTableInputFormat.java  |  177 ++++
 .../hadoop/hbase/mapreduce/TestTableSplit.java     |   24 +-
 .../org/apache/hadoop/hbase/util/LoadTestTool.java |   17 +-
 hbase-metrics-api/pom.xml                          |   13 +-
 hbase-metrics/pom.xml                              |   13 +-
 hbase-procedure/pom.xml                            |   13 +-
 .../src/main/protobuf/server/Snapshot.proto        |    1 +
 .../src/main/protobuf/server/master/Master.proto   |   10 +
 hbase-replication/pom.xml                          |   13 +-
 hbase-rest/pom.xml                                 |   18 +-
 .../org/apache/hadoop/hbase/rest/Constants.java    |    8 +
 .../apache/hadoop/hbase/rest/client/Client.java    |   66 +-
 hbase-server/pom.xml                               |   18 +-
 .../hadoop/hbase/coprocessor/RegionObserver.java   |    2 +-
 .../hadoop/hbase/io/hfile/LruBlockCache.java       |    7 +-
 .../org/apache/hadoop/hbase/master/HMaster.java    |    2 +-
 .../org/apache/hadoop/hbase/master/HbckChore.java  |   10 +
 .../hadoop/hbase/master/MasterRpcServices.java     |   25 +
 .../hbase/master/MetricsAssignmentManager.java     |   28 +
 .../apache/hadoop/hbase/master/ServerManager.java  |   11 +
 .../hbase/master/assignment/AssignmentManager.java |   11 +
 .../master/assignment/AssignmentManagerUtil.java   |   63 ++
 .../assignment/SplitTableRegionProcedure.java      |    2 +-
 .../hbase/master/balancer/CandidateGenerator.java  |    6 +-
 .../master/balancer/StochasticLoadBalancer.java    |    7 +
 .../hadoop/hbase/master/cleaner/CleanerChore.java  |   13 +-
 .../hbase/master/janitor/CatalogJanitor.java       |   12 +
 .../master/normalizer/SimpleRegionNormalizer.java  |   19 +-
 .../hbase/master/snapshot/SnapshotManager.java     |    4 +
 .../hbase/master/snapshot/TakeSnapshotHandler.java |    9 +-
 .../hbase/regionserver/BusyRegionSplitPolicy.java  |    8 +-
 .../ConstantSizeRegionSplitPolicy.java             |   21 +-
 .../DelimitedKeyPrefixRegionSplitPolicy.java       |    6 +
 .../hbase/regionserver/FlushAllStoresPolicy.java   |    7 +-
 .../hbase/regionserver/FlushLargeStoresPolicy.java |    5 +
 .../apache/hadoop/hbase/regionserver/HRegion.java  |   82 +-
 .../IncreasingToUpperBoundRegionSplitPolicy.java   |    6 +
 .../regionserver/KeyPrefixRegionSplitPolicy.java   |    6 +
 .../hadoop/hbase/regionserver/MemStoreFlusher.java |   67 +-
 .../hbase/regionserver/MetricsRegionServer.java    |   45 +-
 .../hadoop/hbase/regionserver/RSRpcServices.java   |   75 +-
 .../hbase/regionserver/RegionScannerImpl.java      |    5 +-
 .../regionserver/RegionServerTableMetrics.java     |   26 +-
 .../hbase/regionserver/SteppingSplitPolicy.java    |    7 +-
 .../compactions/CurrentHourProvider.java           |   21 +-
 .../replication/regionserver/MetricsSource.java    |   36 +-
 .../regionserver/ReplicationSource.java            |   23 +-
 .../regionserver/ReplicationSourceLogQueue.java    |    4 +
 .../apache/hadoop/hbase/HBaseTestingUtility.java   |    1 -
 .../TestAsyncTableBatchRetryImmediately.java       |   11 +-
 .../hbase/client/TestAsyncTableNoncedRetry.java    |  268 ++++-
 .../hbase/client/TestMultiRespectsLimits.java      |   10 +-
 .../org/apache/hadoop/hbase/client/TestResult.java |  141 +++
 .../apache/hadoop/hbase/ipc/TestProtoBufRpc.java   |    7 +-
 .../hbase/ipc/TestRpcServerTraceLogging.java       |   24 +-
 .../hbase/master/TestActiveMasterManager.java      |   85 +-
 .../master/assignment/AssignmentTestingUtil.java   |   25 +
 .../hbase/master/assignment/TestRegionSplit.java   |   41 +-
 ...ava => TestRegionSplitAndSeparateChildren.java} |   65 +-
 .../assignment/TestSplitTableRegionProcedure.java  |   64 +-
 ...estStochasticLoadBalancerHeterogeneousCost.java |   23 +
 .../hbase/master/cleaner/TestHFileCleaner.java     |   69 +-
 .../hbase/master/cleaner/TestHFileLinkCleaner.java |   64 +-
 .../hbase/master/cleaner/TestLogsCleaner.java      |   65 +-
 .../cleaner/TestReplicationHFileCleaner.java       |   67 +-
 .../hadoop/hbase/master/procedure/TestHBCKSCP.java |   30 +-
 ...taWithReplicas.java => TestHBCKSCPUnknown.java} |   36 +-
 .../master/snapshot/TestTakeSnapshotHandler.java   |  111 ++
 .../RegionProcedureStorePerformanceEvaluation.java |   65 +-
 .../hbase/regionserver/TestMemStoreFlusher.java    |   98 ++
 .../regionserver/TestMetricsRegionServer.java      |   24 +
 .../regionserver/TestMetricsTableLatencies.java    |   52 +-
 .../hbase/regionserver/TestMultiLogThreshold.java  |   64 +-
 .../TestRegionServerReportForDuty.java             |   34 +-
 .../hbase/regionserver/TestSplitLogWorker.java     |   64 +-
 .../hadoop/hbase/regionserver/TestWALLockup.java   |  115 +--
 .../compactions/PerfTestCompactionPolicies.java    |   11 +-
 .../compactions/TestCurrentHourProvider.java       |   40 +-
 .../replication/TestReplicationTrackerZKImpl.java  |   69 +-
 .../regionserver/TestReplicationSource.java        |   33 +-
 .../regionserver/TestReplicationSourceManager.java |   63 +-
 .../regionserver/TestWALEntryStream.java           |   30 +-
 .../hadoop/hbase/security/TestSecureIPC.java       |  124 +++
 .../apache/hadoop/hbase/tool/TestCanaryTool.java   |  171 ++--
 .../org/apache/hadoop/hbase/util/MockServer.java   |   55 +-
 hbase-shaded/hbase-shaded-check-invariants/pom.xml |   16 +-
 .../hbase-shaded-client-byo-hadoop/pom.xml         |  230 ++---
 hbase-shaded/hbase-shaded-client/pom.xml           |  151 ++-
 hbase-shaded/hbase-shaded-mapreduce/pom.xml        |  462 ++++-----
 .../hbase-shaded-testing-util-tester/pom.xml       |  142 +--
 hbase-shaded/hbase-shaded-testing-util/pom.xml     |  430 ++++----
 .../pom.xml                                        |   15 +-
 hbase-shaded/pom.xml                               | 1077 ++++++++++----------
 hbase-shell/pom.xml                                |   18 +-
 hbase-shell/src/main/ruby/hbase/admin.rb           |    3 +
 .../src/main/ruby/shell/commands/snapshot.rb       |    2 +-
 hbase-testing-util/pom.xml                         |  330 +++---
 hbase-thrift/pom.xml                               |   22 +-
 .../apache/hadoop/hbase/thrift/ThriftServer.java   |    4 +-
 .../hbase/thrift/generated/AlreadyExists.java      |    8 +-
 .../hbase/thrift/generated/BatchMutation.java      |   12 +-
 .../hbase/thrift/generated/ColumnDescriptor.java   |   24 +-
 .../hadoop/hbase/thrift/generated/Hbase.java       |  748 +++++---------
 .../hadoop/hbase/thrift/generated/IOError.java     |    8 +-
 .../hbase/thrift/generated/IllegalArgument.java    |    8 +-
 .../hadoop/hbase/thrift/generated/Mutation.java    |   14 +-
 .../hadoop/hbase/thrift/generated/TAppend.java     |   18 +-
 .../hadoop/hbase/thrift/generated/TCell.java       |   10 +-
 .../hadoop/hbase/thrift/generated/TColumn.java     |   10 +-
 .../hadoop/hbase/thrift/generated/TIncrement.java  |   14 +-
 .../hadoop/hbase/thrift/generated/TRegionInfo.java |   20 +-
 .../hadoop/hbase/thrift/generated/TRowResult.java  |   16 +-
 .../hadoop/hbase/thrift/generated/TScan.java       |   28 +-
 .../hbase/thrift/generated/TThriftServerType.java  |    4 +-
 .../hbase/thrift2/client/ThriftConnection.java     |   18 +-
 .../hadoop/hbase/thrift2/generated/TAppend.java    |   22 +-
 .../hbase/thrift2/generated/TAuthorization.java    |   10 +-
 .../hbase/thrift2/generated/TBloomFilterType.java  |    4 +-
 .../hbase/thrift2/generated/TCellVisibility.java   |    8 +-
 .../hadoop/hbase/thrift2/generated/TColumn.java    |   12 +-
 .../thrift2/generated/TColumnFamilyDescriptor.java |   50 +-
 .../hbase/thrift2/generated/TColumnIncrement.java  |   12 +-
 .../hbase/thrift2/generated/TColumnValue.java      |   18 +-
 .../hbase/thrift2/generated/TCompareOperator.java  |    4 +-
 .../thrift2/generated/TCompressionAlgorithm.java   |    4 +-
 .../hbase/thrift2/generated/TConsistency.java      |    4 +-
 .../thrift2/generated/TDataBlockEncoding.java      |    4 +-
 .../hadoop/hbase/thrift2/generated/TDelete.java    |   22 +-
 .../hbase/thrift2/generated/TDeleteType.java       |    4 +-
 .../hbase/thrift2/generated/TDurability.java       |    4 +-
 .../hbase/thrift2/generated/TFilterByOperator.java |    4 +-
 .../hadoop/hbase/thrift2/generated/TGet.java       |   40 +-
 .../hbase/thrift2/generated/THBaseService.java     |  594 ++++-------
 .../hbase/thrift2/generated/THRegionInfo.java      |   20 +-
 .../hbase/thrift2/generated/THRegionLocation.java  |   10 +-
 .../hadoop/hbase/thrift2/generated/TIOError.java   |    8 +-
 .../hbase/thrift2/generated/TIllegalArgument.java  |    8 +-
 .../hadoop/hbase/thrift2/generated/TIncrement.java |   22 +-
 .../hbase/thrift2/generated/TKeepDeletedCells.java |    4 +-
 .../hbase/thrift2/generated/TLogQueryFilter.java   |   20 +-
 .../hadoop/hbase/thrift2/generated/TLogType.java   |    4 +-
 .../hadoop/hbase/thrift2/generated/TMutation.java  |   10 +-
 .../thrift2/generated/TNamespaceDescriptor.java    |   12 +-
 .../hbase/thrift2/generated/TOnlineLogRecord.java  |   34 +-
 .../hadoop/hbase/thrift2/generated/TPut.java       |   22 +-
 .../hadoop/hbase/thrift2/generated/TReadType.java  |    4 +-
 .../hadoop/hbase/thrift2/generated/TResult.java    |   16 +-
 .../hbase/thrift2/generated/TRowMutations.java     |   12 +-
 .../hadoop/hbase/thrift2/generated/TScan.java      |   48 +-
 .../hbase/thrift2/generated/TServerName.java       |   12 +-
 .../hbase/thrift2/generated/TTableDescriptor.java  |   18 +-
 .../hadoop/hbase/thrift2/generated/TTableName.java |   10 +-
 .../hbase/thrift2/generated/TThriftServerType.java |    4 +-
 .../hadoop/hbase/thrift2/generated/TTimeRange.java |   10 +-
 .../hbase/thrift/TestThriftServerCmdLine.java      |    2 +-
 .../hbase/thrift2/TestThrift2ServerCmdLine.java    |    2 +-
 hbase-zookeeper/pom.xml                            |   13 +-
 .../hadoop/hbase/zookeeper/ZKLeaderManager.java    |    2 +-
 pom.xml                                            |  141 ++-
 src/main/asciidoc/_chapters/hbase_mob.adoc         |    4 +-
 src/main/asciidoc/_chapters/ops_mgt.adoc           |   37 +-
 src/main/asciidoc/_chapters/security.adoc          |    2 +-
 src/site/xdoc/downloads.xml                        |   16 +-
 243 files changed, 6826 insertions(+), 5189 deletions(-)
 delete mode 100644 conf/log4j-hbtop.properties
 delete mode 100644 conf/log4j.properties
 copy hbase-archetypes/hbase-client-project/src/test/resources/hbase-site.xml => conf/log4j2-hbtop.xml (63%)
 create mode 100644 conf/log4j2.xml
 delete mode 100644 hbase-archetypes/hbase-client-project/src/main/resources/log4j.properties
 create mode 100644 hbase-archetypes/hbase-client-project/src/main/resources/log4j2.xml
 delete mode 100644 hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j.properties
 create mode 100644 hbase-archetypes/hbase-shaded-client-project/src/main/resources/log4j2.xml
 delete mode 100644 hbase-logging/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java
 create mode 100644 hbase-logging/src/test/java/org/apache/log4j/FileAppender.java
 delete mode 100644 hbase-logging/src/test/resources/log4j.properties
 create mode 100644 hbase-logging/src/test/resources/log4j2.xml
 create mode 100644 hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/RoundRobinTableInputFormat.java
 create mode 100644 hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRoundRobinTableInputFormat.java
 copy hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/{TestRegionSplit.java => TestRegionSplitAndSeparateChildren.java} (72%)
 copy hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/{TestSCPWithMetaWithReplicas.java => TestHBCKSCPUnknown.java} (55%)
 create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestTakeSnapshotHandler.java
 create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreFlusher.java