[4/5] 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/fca24e1f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fca24e1f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fca24e1f Branch: refs/heads/trunk Commit: fca24e1fc0d707adeb77471aa349ab9491ea0e97 Parents: b815c78 4b01e8f Author: Benjamin Lerer Authored: Thu Dec 3 21:37:38 2015 +0100 Committer: Benjamin Lerer Committed: Thu Dec 3 21:37:47 2015 +0100 -- CHANGES.txt | 1 + .../apache/cassandra/stress/settings/SettingsCommandUser.java | 7 +-- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fca24e1f/CHANGES.txt --
[4/5] 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/6405f6c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6405f6c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6405f6c9 Branch: refs/heads/trunk Commit: 6405f6c9c7bc0b31ab43f6aee4fd16598ba82c1f Parents: 62de5a3 d7068fd Author: Tyler Hobbs Authored: Wed Dec 2 15:33:04 2015 -0600 Committer: Tyler Hobbs Committed: Wed Dec 2 15:33:04 2015 -0600 -- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6405f6c9/build.xml --
[4/5] 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/b97fa110 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b97fa110 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b97fa110 Branch: refs/heads/trunk Commit: b97fa1101e2ad8d4517117113ac2a40a5387e289 Parents: 38eaf7f bb6973a Author: Marcus Eriksson Authored: Wed Dec 2 15:09:19 2015 +0100 Committer: Marcus Eriksson Committed: Wed Dec 2 15:09:19 2015 +0100 -- --
[4/5] 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/02492f7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02492f7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02492f7b Branch: refs/heads/trunk Commit: 02492f7bca4d668c7c5ad60641f8d182f966cb37 Parents: 4c6f325 ad84add Author: Marcus Eriksson Authored: Wed Dec 2 09:01:52 2015 +0100 Committer: Marcus Eriksson Committed: Wed Dec 2 09:01:52 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 4 +- src/java/org/apache/cassandra/dht/Range.java| 42 + .../org/apache/cassandra/dht/RangeTest.java | 65 4 files changed, 110 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02492f7b/CHANGES.txt --
[4/5] 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/4c6f3256 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6f3256 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6f3256 Branch: refs/heads/trunk Commit: 4c6f32569dcb8d9851ca0c3976c1ae055b99e069 Parents: 5b6a368 f7aaea0 Author: T Jake Luciani Authored: Tue Dec 1 22:46:10 2015 -0500 Committer: T Jake Luciani Committed: Tue Dec 1 22:46:10 2015 -0500 -- CHANGES.txt | 2 + .../io/compress/CompressedSequentialWriter.java | 2 +- .../io/util/BufferedDataOutputStreamPlus.java | 22 +- .../cassandra/io/util/DataOutputBuffer.java | 78 ++- .../io/util/DataOutputBufferFixed.java | 2 +- .../cassandra/io/util/SafeMemoryWriter.java | 10 +- .../cassandra/io/util/SequentialWriter.java | 4 +- .../cassandra/io/util/DataOutputTest.java | 202 +++ 8 files changed, 301 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6f3256/CHANGES.txt --
[4/5] 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/b5fb5737 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5fb5737 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5fb5737 Branch: refs/heads/trunk Commit: b5fb5737a0c127584d945acb8f1322bf05dea69f Parents: 17e13e5 56965fd Author: Robert Stupp Authored: Fri Nov 27 13:55:58 2015 +0100 Committer: Robert Stupp Committed: Fri Nov 27 13:55:58 2015 +0100 -- CHANGES.txt | 1 + NEWS.txt| 6 + src/java/org/apache/cassandra/gms/Gossiper.java | 28 +- .../locator/GossipingPropertyFileSnitch.java| 107 ++ .../cassandra/locator/PropertyFileSnitch.java | 74 +++- .../cassandra/locator/SnitchProperties.java | 5 + .../cassandra/service/CassandraDaemon.java | 17 +- .../cassandra/service/MigrationManager.java | 4 +- .../apache/cassandra/service/StorageProxy.java | 8 +- .../cassandra/service/StorageService.java | 28 +- .../GossipingPropertyFileSnitchTest.java| 35 +- .../locator/PropertyFileSnitchTest.java | 334 +++ 12 files changed, 493 insertions(+), 154 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5fb5737/CHANGES.txt --
[4/5] 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/21a7a1c0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21a7a1c0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21a7a1c0 Branch: refs/heads/trunk Commit: 21a7a1c0912e50a09ed9efcbe65f25e6e353a17d Parents: 55bf08a b166f5f Author: Robert Stupp Authored: Fri Nov 27 12:58:57 2015 +0100 Committer: Robert Stupp Committed: Fri Nov 27 12:58:57 2015 +0100 -- CHANGES.txt | 1 + debian/init | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/21a7a1c0/CHANGES.txt --
[4/5] 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/29178b2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29178b2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29178b2f Branch: refs/heads/trunk Commit: 29178b2fe4881a46708bd03017fff050ac6af287 Parents: c29279c e8091d5 Author: Robert Stupp Authored: Fri Nov 27 09:30:57 2015 +0100 Committer: Robert Stupp Committed: Fri Nov 27 09:30:57 2015 +0100 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/db/DeletionTime.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29178b2f/CHANGES.txt --
[4/5] 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/b7ead2b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ead2b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ead2b3 Branch: refs/heads/trunk Commit: b7ead2b330e8b3b3a70eaf36895fb1b7f1c6f1b2 Parents: 5fd65f3 64a3bfd Author: Sylvain Lebresne Authored: Thu Nov 26 10:42:50 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 26 10:42:50 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ead2b3/CHANGES.txt --
[4/5] 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/5fd65f3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd65f3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd65f3b Branch: refs/heads/trunk Commit: 5fd65f3b7d18bb1fdf93906463bbd657cbea39c6 Parents: c2ea8c4 2cbd776 Author: Sylvain Lebresne Authored: Thu Nov 26 10:23:28 2015 +0100 Committer: Sylvain Lebresne Committed: Thu Nov 26 10:23:28 2015 +0100 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Json.java| 25 +- .../org/apache/cassandra/cql3/QueryOptions.java | 52 ++-- .../apache/cassandra/cql3/QueryProcessor.java | 40 --- .../cql3/statements/AlterKeyspaceStatement.java | 7 +-- .../cql3/statements/AlterTableStatement.java| 9 +--- .../cql3/statements/AlterTypeStatement.java | 9 +--- .../cql3/statements/AlterViewStatement.java | 9 +--- .../statements/CreateAggregateStatement.java| 27 +++--- .../statements/CreateFunctionStatement.java | 23 +++-- .../cql3/statements/CreateIndexStatement.java | 8 +-- .../statements/CreateKeyspaceStatement.java | 11 ++--- .../cql3/statements/CreateTableStatement.java | 11 ++--- .../cql3/statements/CreateTriggerStatement.java | 9 +--- .../cql3/statements/CreateTypeStatement.java| 11 ++--- .../cql3/statements/CreateViewStatement.java| 12 ++--- .../cql3/statements/DropAggregateStatement.java | 19 ++- .../cql3/statements/DropFunctionStatement.java | 20 ++-- .../cql3/statements/DropIndexStatement.java | 41 +++ .../cql3/statements/DropKeyspaceStatement.java | 11 ++--- .../cql3/statements/DropTableStatement.java | 11 ++--- .../cql3/statements/DropTriggerStatement.java | 9 +--- .../cql3/statements/DropTypeStatement.java | 11 ++--- .../cql3/statements/DropViewStatement.java | 11 ++--- .../statements/SchemaAlteringStatement.java | 26 -- .../org/apache/cassandra/cql3/CQLTester.java| 29 ++- .../validation/entities/SecondaryIndexTest.java | 9 .../index/internal/CassandraIndexTest.java | 8 +++ 28 files changed, 220 insertions(+), 249 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fd65f3b/CHANGES.txt --
[4/5] 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/c2ea8c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ea8c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2ea8c4f Branch: refs/heads/trunk Commit: c2ea8c4fc82ec470710de51b41e6de429dfebc80 Parents: 138f8db 71bca78 Author: Marcus Eriksson Authored: Thu Nov 26 08:41:49 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:41:49 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 77 3 files changed, 82 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2ea8c4f/CHANGES.txt --
[4/5] 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/138f8db8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/138f8db8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/138f8db8 Branch: refs/heads/trunk Commit: 138f8db85b85ce2061894b42e4f6652c237bc4de Parents: c1b1aec 5fd6c54 Author: Tyler Hobbs Authored: Wed Nov 25 17:53:34 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[4/5] 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/e0c94522 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c94522 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0c94522 Branch: refs/heads/trunk Commit: e0c9452286a6237bf40650d28ddac77899d436ee Parents: 23a84f0 9fe790d Author: Aleksey Yeschenko Authored: Mon Nov 23 17:15:15 2015 + Committer: Aleksey Yeschenko Committed: Mon Nov 23 17:15:15 2015 + -- --
[4/5] 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/1c252b94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c252b94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c252b94 Branch: refs/heads/trunk Commit: 1c252b94d134169c89dc20cae4f50ae11df8daa9 Parents: 5887515 8a0615b Author: Sylvain Lebresne Authored: Fri Nov 20 14:01:35 2015 +0100 Committer: Sylvain Lebresne Committed: Fri Nov 20 14:01:35 2015 +0100 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c252b94/CHANGES.txt --
[4/5] 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/d7138f15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7138f15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7138f15 Branch: refs/heads/trunk Commit: d7138f15119d15404c8149ab95430fcdd1f83cfd Parents: 36019ab d1c3c67 Author: Marcus Eriksson Authored: Fri Nov 20 12:04:30 2015 +0100 Committer: Marcus Eriksson Committed: Fri Nov 20 12:04:30 2015 +0100 -- NEWS.txt | 4 1 file changed, 4 insertions(+) --
[4/5] 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/36019ab1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36019ab1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36019ab1 Branch: refs/heads/trunk Commit: 36019ab1728eb084b201ec452d17047555ebc1ef Parents: 28e51d6 f4ae344 Author: Marcus Eriksson Authored: Fri Nov 20 11:06:58 2015 +0100 Committer: Marcus Eriksson Committed: Fri Nov 20 11:06:58 2015 +0100 -- CHANGES.txt | 1 + pylib/cqlshlib/cql3handling.py | 1 + .../DateTieredCompactionStrategy.java | 34 +++- .../DateTieredCompactionStrategyOptions.java| 30 +++-- .../DateTieredCompactionStrategyTest.java | 34 5 files changed, 70 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36019ab1/CHANGES.txt --
[4/5] 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/28e51d66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28e51d66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28e51d66 Branch: refs/heads/trunk Commit: 28e51d66f3b986989e2580869b428e7d48c253b1 Parents: d1103f5 747e5fd Author: Robert Stupp Authored: Thu Nov 19 11:11:30 2015 +0100 Committer: Robert Stupp Committed: Thu Nov 19 11:11:30 2015 +0100 -- CHANGES.txt | 1 + bin/sstableloader | 6 +- 2 files changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28e51d66/CHANGES.txt --
[4/5] 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/b0f159c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b0f159c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b0f159c4 Branch: refs/heads/trunk Commit: b0f159c4a5d232e6aaaf302938dd41f9e59a2236 Parents: 7d31850 12fd5d2 Author: Marcus Eriksson Authored: Wed Nov 18 14:00:17 2015 +0100 Committer: Marcus Eriksson Committed: Wed Nov 18 14:00:17 2015 +0100 -- --
[4/5] 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/7d318505 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d318505 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d318505 Branch: refs/heads/trunk Commit: 7d3185059536ba23b6a4a3fa5a210697c6ac1850 Parents: 5be1f66 2753f95 Author: Aleksey Yeschenko Authored: Wed Nov 18 12:54:43 2015 + Committer: Aleksey Yeschenko Committed: Wed Nov 18 12:54:43 2015 + -- --
[4/5] 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/3851d1c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3851d1c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3851d1c5 Branch: refs/heads/trunk Commit: 3851d1c586e37cdcf2c69c3b9cc1e96ac0dbfee3 Parents: fff1b21 63a9f9b Author: Aleksey Yeschenko Authored: Tue Nov 17 18:57:22 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 17 18:57:22 2015 + -- --
[4/5] 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/fff1b212 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fff1b212 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fff1b212 Branch: refs/heads/trunk Commit: fff1b2128e157057b60f4c9782e3614c2aaf67c9 Parents: 51a8711 aa21bd2 Author: Aleksey Yeschenko Authored: Tue Nov 17 16:54:56 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 17 16:54:56 2015 + -- CHANGES.txt | 1 + .../cassandra/cql3/statements/AlterTableStatement.java | 3 +++ .../cassandra/cql3/validation/operations/AlterTest.java | 8 3 files changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fff1b212/CHANGES.txt --
[4/5] 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/e11bd0fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e11bd0fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e11bd0fa Branch: refs/heads/trunk Commit: e11bd0fa8cb2768037143f5ed8c772f8a84c64b4 Parents: 5576f45 9f056a9 Author: Aleksey Yeschenko Authored: Thu Nov 12 18:07:10 2015 + Committer: Aleksey Yeschenko Committed: Thu Nov 12 18:07:10 2015 + -- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 5 +++ .../cassandra/service/StorageServiceMBean.java | 5 +++ .../org/apache/cassandra/tools/NodeProbe.java | 12 +++ .../org/apache/cassandra/tools/NodeTool.java| 3 +- .../tools/nodetool/RefreshSizeEstimates.java| 33 6 files changed, 58 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e11bd0fa/CHANGES.txt --
[4/5] 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/84fe374d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84fe374d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84fe374d Branch: refs/heads/trunk Commit: 84fe374d2964079c2b54f7eb3682af977f75378f Parents: e8ee9ed d766f4f Author: Aleksey Yeschenko Authored: Tue Nov 10 14:42:46 2015 + Committer: Aleksey Yeschenko Committed: Tue Nov 10 14:42:46 2015 + -- CHANGES.txt | 2 + .../cassandra/hadoop/cql3/CqlRecordWriter.java | 94 ++-- .../io/sstable/CQLSSTableWriterTest.java| 2 +- 3 files changed, 51 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84fe374d/CHANGES.txt -- diff --cc CHANGES.txt index 268ad08,24e42c0..03b8544 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,4 -1,6 +1,6 @@@ -3.0.1 +3.1 + Merged from 2.2: + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) Merged from 2.1: * Reject counter writes in CQLSSTableWriter (CASSANDRA-10258) * Remove superfluous COUNTER_MUTATION stage mapping (CASSANDRA-10605)
