Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D77A01133A for ; Fri, 5 Sep 2014 21:53:41 +0000 (UTC) Received: (qmail 1971 invoked by uid 500); 5 Sep 2014 21:53:41 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 1828 invoked by uid 500); 5 Sep 2014 21:53:41 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 1803 invoked by uid 99); 5 Sep 2014 21:53:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Sep 2014 21:53:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 590FFA0B5FE; Fri, 5 Sep 2014 21:53:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Date: Fri, 05 Sep 2014 21:53:42 -0000 Message-Id: <0bc3d170eb9d49269f2045fc3e13778f@git.apache.org> In-Reply-To: <80a75002bee045ee960fa9135eb9296b@git.apache.org> References: <80a75002bee045ee960fa9135eb9296b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/hbase 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/a9a1eb50 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a9a1eb50 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a9a1eb50 Branch: refs/heads/master Commit: a9a1eb50ceec5d4efb6db8e35538d65615bb2a1f Parents: c9e5229 39609a5 Author: Ted Yu Authored: Fri Sep 5 21:53:30 2014 +0000 Committer: Ted Yu Committed: Fri Sep 5 21:53:30 2014 +0000 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/ClusterStatusListener.java | 2 ++ .../java/org/apache/hadoop/hbase/HBaseInterfaceAudience.java | 4 ++++ .../main/java/org/apache/hadoop/hbase/codec/CellCodec.java | 3 ++- .../org/apache/hadoop/hbase/codec/CellCodecWithTags.java | 5 +++-- .../java/org/apache/hadoop/hbase/codec/KeyValueCodec.java | 5 +++-- .../org/apache/hadoop/hbase/codec/KeyValueCodecWithTags.java | 5 +++-- .../hbase/backup/example/LongTermArchivingHFileCleaner.java | 3 ++- .../java/org/apache/hadoop/hbase/codec/MessageCodec.java | 3 ++- .../hadoop/hbase/coordination/ZkCoordinatedStateManager.java | 3 ++- .../apache/hadoop/hbase/coprocessor/BaseMasterObserver.java | 2 +- .../main/java/org/apache/hadoop/hbase/http/HttpServer.java | 2 ++ .../java/org/apache/hadoop/hbase/http/NoCacheFilter.java | 4 ++++ .../apache/hadoop/hbase/http/lib/StaticUserWebFilter.java | 4 ++++ .../java/org/apache/hadoop/hbase/ipc/PriorityFunction.java | 7 ++++++- .../apache/hadoop/hbase/master/ClusterStatusPublisher.java | 2 ++ .../hbase/master/balancer/FavoredNodeLoadBalancer.java | 5 +++-- .../hadoop/hbase/master/balancer/SimpleLoadBalancer.java | 3 ++- .../hadoop/hbase/master/balancer/StochasticLoadBalancer.java | 3 ++- .../apache/hadoop/hbase/master/cleaner/HFileLinkCleaner.java | 3 ++- .../hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java | 3 ++- .../hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java | 3 ++- .../hadoop/hbase/master/snapshot/SnapshotHFileCleaner.java | 3 ++- .../hadoop/hbase/master/snapshot/SnapshotLogCleaner.java | 3 ++- .../apache/hadoop/hbase/master/snapshot/SnapshotManager.java | 3 ++- .../procedure/flush/MasterFlushTableProcedureManager.java | 5 ++++- .../flush/RegionServerFlushTableProcedureManager.java | 3 ++- .../regionserver/AnnotationReadingPriorityFunction.java | 2 ++ .../apache/hadoop/hbase/regionserver/BaseRowProcessor.java | 5 +++++ .../hbase/regionserver/ConstantSizeRegionSplitPolicy.java | 3 ++- .../apache/hadoop/hbase/regionserver/DefaultStoreEngine.java | 3 ++- .../hadoop/hbase/regionserver/DefaultStoreFlusher.java | 2 ++ .../hadoop/hbase/regionserver/DisabledRegionSplitPolicy.java | 4 ++++ .../IncreasingToUpperBoundRegionSplitPolicy.java | 2 ++ .../hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java | 2 ++ .../hadoop/hbase/regionserver/MultiRowMutationProcessor.java | 2 ++ .../hadoop/hbase/regionserver/RegionCoprocessorHost.java | 5 +++++ .../hbase/regionserver/RegionServerCoprocessorHost.java | 5 +++++ .../apache/hadoop/hbase/regionserver/RegionSplitPolicy.java | 3 ++- .../org/apache/hadoop/hbase/regionserver/RowProcessor.java | 8 +++++--- .../apache/hadoop/hbase/regionserver/RowTooBigException.java | 2 ++ .../hadoop/hbase/regionserver/RpcSchedulerFactory.java | 5 +++++ .../org/apache/hadoop/hbase/regionserver/StoreUtils.java | 3 +++ .../hadoop/hbase/regionserver/StorefileRefresherChore.java | 2 ++ .../hadoop/hbase/regionserver/StripeMultiFileWriter.java | 2 ++ .../apache/hadoop/hbase/regionserver/StripeStoreEngine.java | 3 ++- .../apache/hadoop/hbase/regionserver/StripeStoreFlusher.java | 2 ++ .../hbase/regionserver/compactions/StripeCompactor.java | 2 ++ .../regionserver/snapshot/RegionServerSnapshotManager.java | 3 ++- .../apache/hadoop/hbase/regionserver/wal/HLogFactory.java | 2 ++ .../org/apache/hadoop/hbase/regionserver/wal/HLogUtil.java | 2 ++ .../hadoop/hbase/regionserver/wal/KeyValueCompression.java | 2 ++ .../hadoop/hbase/regionserver/wal/ProtobufLogReader.java | 2 +- .../hadoop/hbase/regionserver/wal/ProtobufLogWriter.java | 3 ++- .../hbase/regionserver/wal/SecureProtobufLogReader.java | 3 +++ .../hbase/regionserver/wal/SecureProtobufLogWriter.java | 3 +++ .../hadoop/hbase/regionserver/wal/SecureWALCellCodec.java | 2 ++ .../hadoop/hbase/regionserver/wal/SequenceFileLogReader.java | 2 +- .../apache/hadoop/hbase/regionserver/wal/WALCellCodec.java | 2 +- .../hbase/replication/master/ReplicationLogCleaner.java | 3 ++- .../java/org/apache/hadoop/hbase/rest/filter/GzipFilter.java | 3 ++- .../hadoop/hbase/security/access/AccessController.java | 3 ++- .../hbase/security/visibility/VisibilityController.java | 3 ++- .../hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java | 3 ++- 63 files changed, 158 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a9a1eb50/hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a9a1eb50/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java ----------------------------------------------------------------------