You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@distributedlog.apache.org by si...@apache.org on 2016/12/21 08:00:34 UTC
[26/29] incubator-distributedlog git commit: Merge remote-tracking
branch 'apache/master' into merge/DL-97
Merge remote-tracking branch 'apache/master' into merge/DL-97
Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/f95a0a83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/f95a0a83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/f95a0a83
Branch: refs/heads/merge/DL-98
Commit: f95a0a830b85e65c4a792223f57e9ccc1d74ea6d
Parents: b8e4c14 26942a9
Author: Sijie Guo <si...@apache.org>
Authored: Tue Dec 20 00:08:58 2016 -0800
Committer: Sijie Guo <si...@apache.org>
Committed: Tue Dec 20 00:08:58 2016 -0800
----------------------------------------------------------------------
.../benchmark/stream/AsyncReaderBenchmark.java | 6 +
.../benchmark/stream/LedgerReadBenchmark.java | 4 +
.../benchmark/stream/SyncReaderBenchmark.java | 6 +
.../client/routing/TestRoutingService.java | 4 +-
.../metadata/ZkMetadataResolver.java | 1 +
.../com/twitter/distributedlog/DLMTestUtil.java | 4 +-
.../distributedlog/TestAsyncReaderWriter.java | 8 +-
.../TestBKDistributedLogManager.java | 10 +-
.../TestBKDistributedLogNamespace.java | 25 +++--
.../distributedlog/TestDistributedLogBase.java | 10 +-
.../distributedlog/TestInterleavedReaders.java | 2 +-
.../twitter/distributedlog/TestTruncate.java | 4 +-
.../distributedlog/TestWriteLimiter.java | 20 ++--
.../bk/TestLedgerAllocatorPool.java | 2 +-
.../config/TestConcurrentBaseConfiguration.java | 2 +-
.../impl/TestZKLogSegmentFilters.java | 2 +-
.../limiter/TestRequestLimiter.java | 2 +-
.../TestLogSegmentMetadataStoreUpdater.java | 2 +-
.../distributedlog/util/TestConfUtils.java | 2 +-
.../distributedlog/util/TestPermitManager.java | 4 +-
.../util/TestSafeQueueingFuturePool.java | 10 +-
.../src/main/thrift/service.thrift | 111 ++++++++++---------
.../service/stream/TestStreamManager.java | 2 +-
.../2016-09-19-kafka-vs-distributedlog.md | 3 +-
24 files changed, 136 insertions(+), 110 deletions(-)
----------------------------------------------------------------------