[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4ee374ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ee374ab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ee374ab Branch: refs/heads/trunk Commit: 4ee374ab36431cdaa071abf99cd4c4501afbf57f Parents: b97fa11 e00e32e Author: Yuki MorishitaAuthored: Wed Dec 2 08:53:17 2015 -0600 Committer: Yuki Morishita Committed: Wed Dec 2 08:53:17 2015 -0600 -- CHANGES.txt | 1 + .../cassandra/repair/AnticompactionTask.java| 23 ++-- .../cassandra/service/ActiveRepairService.java | 15 ++--- 3 files changed, 29 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ee374ab/CHANGES.txt --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38eaf7f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38eaf7f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38eaf7f1 Branch: refs/heads/trunk Commit: 38eaf7f1077b324630bb7d180872f709b0ee9de2 Parents: ac60e7d b950c38 Author: Sam TunnicliffeAuthored: Wed Dec 2 13:19:39 2015 + Committer: Sam Tunnicliffe Committed: Wed Dec 2 13:19:39 2015 + -- src/java/org/apache/cassandra/gms/Gossiper.java | 21 +++- .../cassandra/locator/PropertyFileSnitch.java | 7 ++- .../cassandra/service/MigrationManager.java | 4 ++-- .../apache/cassandra/service/StorageProxy.java | 8 .../cassandra/service/StorageService.java | 12 +-- 5 files changed, 30 insertions(+), 22 deletions(-) --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b6a368c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b6a368c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b6a368c Branch: refs/heads/trunk Commit: 5b6a368c90233072c419e94bd3c3cb8c1362376e Parents: 6bda886 ccb20ad Author: Yuki MorishitaAuthored: Tue Dec 1 13:07:51 2015 -0600 Committer: Yuki Morishita Committed: Tue Dec 1 13:07:51 2015 -0600 -- CHANGES.txt | 1 + .../cassandra/streaming/StreamReceiveTask.java | 60 ++-- 2 files changed, 31 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b6a368c/CHANGES.txt --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e1b6ea7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e1b6ea7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e1b6ea7 Branch: refs/heads/trunk Commit: 8e1b6ea70b16a39c729700ecfc2fb7e406545e5a Parents: 8feb66e 602f736 Author: Sam TunnicliffeAuthored: Wed Nov 25 10:09:23 2015 + Committer: Sam Tunnicliffe Committed: Wed Nov 25 10:09:23 2015 + -- --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8737fda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8737fda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8737fda Branch: refs/heads/trunk Commit: e8737fda3aea7ac28fe04c02fa687d2606b8d6c8 Parents: e0c9452 0b3cfae Author: Yuki MorishitaAuthored: Mon Nov 23 13:59:04 2015 -0600 Committer: Yuki Morishita Committed: Mon Nov 23 13:59:04 2015 -0600 -- CHANGES.txt | 1 + .../compress/CompressedInputStream.java | 46 -- .../compress/CompressedStreamReader.java| 4 + .../compression/CompressedInputStreamTest.java | 88 4 files changed, 114 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8737fda/CHANGES.txt --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5be1f663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5be1f663 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5be1f663 Branch: refs/heads/trunk Commit: 5be1f663b62288043c112dbf82319bf0a63fc689 Parents: 3851d1c 5cc02dd Author: Yuki MorishitaAuthored: Tue Nov 17 19:31:44 2015 -0600 Committer: Yuki Morishita Committed: Tue Nov 17 19:31:44 2015 -0600 -- CHANGES.txt | 1 + .../io/compress/CompressionMetadata.java| 30 +++ .../streaming/messages/FileMessageHeader.java | 55 ++-- .../streaming/messages/IncomingFileMessage.java | 2 +- .../streaming/messages/OutgoingFileMessage.java | 14 ++--- .../compression/CompressedInputStreamTest.java | 7 +++ 6 files changed, 93 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5be1f663/CHANGES.txt --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/421c41d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/421c41d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/421c41d5 Branch: refs/heads/trunk Commit: 421c41d576fc1eb94fc5887b684fcff16628641b Parents: 6688911 79bf03d Author: Joshua McKenzieAuthored: Fri Nov 13 09:18:02 2015 -0500 Committer: Joshua McKenzie Committed: Fri Nov 13 09:18:02 2015 -0500 -- src/java/org/apache/cassandra/gms/Gossiper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5576f45b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5576f45b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5576f45b Branch: refs/heads/trunk Commit: 5576f45b99d8f596c3e916ffafa687b00d0c9a04 Parents: 0cafccf b54836b Author: Yuki MorishitaAuthored: Thu Nov 12 09:45:06 2015 -0600 Committer: Yuki Morishita Committed: Thu Nov 12 09:45:06 2015 -0600 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5576f45b/CHANGES.txt --
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cafccfc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cafccfc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cafccfc Branch: refs/heads/trunk Commit: 0cafccfc5ce80fc91817de6a5cd74702836de508 Parents: 1fe90d3 0de23f2 Author: Yuki MorishitaAuthored: Wed Nov 11 16:16:44 2015 -0600 Committer: Yuki Morishita Committed: Wed Nov 11 16:16:44 2015 -0600 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 34 +++ .../db/compaction/CompactionController.java | 5 -- src/java/org/apache/cassandra/dht/Bounds.java | 62 .../cassandra/streaming/StreamReader.java | 12 ++-- .../cassandra/streaming/StreamReceiveTask.java | 37 +++- .../compress/CompressedStreamReader.java| 2 +- .../apache/cassandra/db/CounterCacheTest.java | 48 +++ .../org/apache/cassandra/db/RowCacheTest.java | 50 .../org/apache/cassandra/dht/BoundsTest.java| 61 +++ 10 files changed, 298 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cafccfc/CHANGES.txt --