[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc79fe1a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc79fe1a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc79fe1a Branch: refs/heads/trunk Commit: cc79fe1a1c2e396d9362f23e68ace917b9c03f5c Parents: fd40a61 45159ae Author: Yuki Morishita yu...@apache.org Authored: Wed Aug 20 10:04:22 2014 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Wed Aug 20 10:04:22 2014 -0500 -- CHANGES.txt | 1 + .../cassandra/streaming/StreamReceiveTask.java | 57 2 files changed, 35 insertions(+), 23 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc79fe1a/CHANGES.txt --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab45a78d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab45a78d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab45a78d Branch: refs/heads/trunk Commit: ab45a78d6c73c9c0d0d8ebc27f168e3105df7e23 Parents: 8d494c7 da45786 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Aug 20 10:01:20 2014 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Aug 20 10:01:20 2014 -0700 -- CHANGES.txt | 4 ++-- src/java/org/apache/cassandra/config/CFMetaData.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab45a78d/CHANGES.txt --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77f6c25e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77f6c25e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77f6c25e Branch: refs/heads/trunk Commit: 77f6c25e6c1423d15f0af0439553b205bd7bde26 Parents: f454fec 055b896 Author: Yuki Morishita yu...@apache.org Authored: Mon Aug 18 13:27:18 2014 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Mon Aug 18 13:27:18 2014 -0500 -- --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/712f54fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/712f54fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/712f54fe Branch: refs/heads/trunk Commit: 712f54fe8f36756689b15771c7b4080366b3211b Parents: 3060ccc dbc4582 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 12 12:35:04 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 12 12:35:04 2014 -0500 -- .../cassandra/hadoop/cql3/CqlRecordReader.java | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70f277f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70f277f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70f277f5 Branch: refs/heads/trunk Commit: 70f277f50ead8129594f1e533ccf6283e083d851 Parents: 993f4f5 5172860 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 12 13:33:48 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 12 13:33:48 2014 -0500 -- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b896f4dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b896f4dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b896f4dd Branch: refs/heads/trunk Commit: b896f4ddf12149a2666ad310431ad29e4f1dfff6 Parents: 54215a2 fcd2fc0 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 12 20:10:45 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 12 20:10:45 2014 -0500 -- .../cassandra/pig/CqlRecordReaderTest.java | 132 +++ 1 file changed, 132 insertions(+) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/42f2f805 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/42f2f805 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/42f2f805 Branch: refs/heads/trunk Commit: 42f2f805743b493e4faff365862bfed01acfdb67 Parents: b896f4d 397c0b7 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Aug 12 20:51:48 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Aug 12 20:51:48 2014 -0500 -- .../cassandra/hadoop/cql3/CqlRecordReader.java | 2 +- .../cassandra/pig/CqlRecordReaderTest.java | 33 +++- 2 files changed, 33 insertions(+), 2 deletions(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5331900f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5331900f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5331900f Branch: refs/heads/trunk Commit: 5331900f8ec51f50d1a2101051c7fc1e4ada8b31 Parents: c47906d 381dd89 Author: Brandon Williams brandonwilli...@apache.org Authored: Mon Aug 4 12:13:12 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Mon Aug 4 12:13:12 2014 -0500 -- --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/da1f2dbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da1f2dbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/da1f2dbb Branch: refs/heads/trunk Commit: da1f2dbb5ead0c96b854219dc03e9b228148c131 Parents: adc1385 8e4415b Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jul 31 15:13:48 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jul 31 15:13:48 2014 -0500 -- bin/cassandra-shuffle.bat | 37 - 1 file changed, 37 deletions(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4333976c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4333976c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4333976c Branch: refs/heads/trunk Commit: 4333976c8752c0377f743435c19e2e0dd3741f3d Parents: 8d6b732 08fd11d Author: Brandon Williams brandonwilli...@apache.org Authored: Wed Jul 30 16:54:59 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Wed Jul 30 16:54:59 2014 -0500 -- .../cassandra/service/StorageService.java | 45 +--- 1 file changed, 2 insertions(+), 43 deletions(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34c030b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34c030b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34c030b3 Branch: refs/heads/trunk Commit: 34c030b3e5bc8765bbb365e9540eddcbb5fbc0ed Parents: 107f5ba 821d7a7 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jul 25 10:47:16 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jul 25 10:47:16 2014 -0500 -- .../cassandra/db/RecoveryManagerTest.java | 36 1 file changed, 36 insertions(+) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6d24bb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6d24bb9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6d24bb9 Branch: refs/heads/trunk Commit: b6d24bb992d89bf9a26cf370bfc1fafe9d69bd9b Parents: 34c030b 66577d6 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jul 25 10:58:53 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jul 25 10:58:53 2014 -0500 -- --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2a37c79 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2a37c79 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2a37c79 Branch: refs/heads/trunk Commit: b2a37c798920e646629a0c3c772b1cedd6e08ee5 Parents: 192f693 5544ecb Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Jul 25 13:11:18 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Jul 25 13:11:18 2014 -0500 -- conf/commitlog_archiving.properties | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e19431af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e19431af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e19431af Branch: refs/heads/trunk Commit: e19431afc8e69d28eadef6c8b346c6cf7bf4f580 Parents: 992a27e 3c05563 Author: Yuki Morishita yu...@apache.org Authored: Tue Jul 22 16:17:20 2014 -0500 Committer: Yuki Morishita yu...@apache.org Committed: Tue Jul 22 16:17:20 2014 -0500 -- --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f873a327 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f873a327 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f873a327 Branch: refs/heads/trunk Commit: f873a3278603135c494713136cea4e343b0e765f Parents: 3d0e54e 5de9c17 Author: Brandon Williams bran...@datastax.com Authored: Thu Jul 17 15:49:35 2014 -0500 Committer: Brandon Williams bran...@datastax.com Committed: Thu Jul 17 15:49:35 2014 -0500 -- --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52c6dfb8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52c6dfb8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52c6dfb8 Branch: refs/heads/trunk Commit: 52c6dfb8f56b7bbf43fd1f8eac0052a1c8f24d12 Parents: f45a4e3 0401761 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Jul 15 09:57:27 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Jul 15 09:57:27 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52c6dfb8/CHANGES.txt --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6cc03b96 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cc03b96 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cc03b96 Branch: refs/heads/trunk Commit: 6cc03b96060c1c2cc7f3a0ee25db7bd89522f934 Parents: 4d8fea1 1a9d4b8 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Jul 10 12:10:44 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Jul 10 12:10:44 2014 -0500 -- CHANGES.txt | 1 + .../apache/cassandra/security/SSLFactory.java| 19 +++ 2 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6cc03b96/CHANGES.txt --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b48d0da6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48d0da6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48d0da6 Branch: refs/heads/trunk Commit: b48d0da6d4201e12f99d2ccbc633e1bee5a8d6ea Parents: bcc68fe 0e393c9 Author: Benedict Elliott Smith bened...@apache.org Authored: Wed Jul 2 23:42:46 2014 +0100 Committer: Benedict Elliott Smith bened...@apache.org Committed: Wed Jul 2 23:42:46 2014 +0100 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/db/DefsTables.java | 17 +++-- src/java/org/apache/cassandra/db/Keyspace.java | 4 .../apache/cassandra/db/commitlog/CommitLog.java | 17 + .../cassandra/db/commitlog/CommitLogSegment.java | 6 ++ .../db/commitlog/CommitLogSegmentManager.java | 11 +-- .../apache/cassandra/utils/concurrent/OpOrder.java | 7 +++ 7 files changed, 44 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48d0da6/CHANGES.txt -- diff --cc CHANGES.txt index e65a065,22c4123..cfa3dad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,13 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + 2.1.0 * (Windows) handle spaces in path names (CASSANDRA-7451) + * Ensure writes have completed after dropping a table, before recycling +commit log segments (CASSANDRA-7437) Merged from 2.0: * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) * Support DISTINCT for static columns and fix behaviour when DISTINC is http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48d0da6/src/java/org/apache/cassandra/db/DefsTables.java --
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3a1ba6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3a1ba6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba3a1ba6 Branch: refs/heads/trunk Commit: ba3a1ba615c65b8a8619685249a934863bc28bb3 Parents: 3ae5559 c23eccf Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jun 30 21:13:09 2014 -0700 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jun 30 21:13:09 2014 -0700 -- CHANGES.txt | 2 ++ lib/snappy-java-1.0.5.1.jar | Bin 1280090 - 0 bytes lib/snappy-java-1.0.5.2.jar | Bin 0 - 1339383 bytes 3 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3a1ba6/CHANGES.txt -- diff --cc CHANGES.txt index a32fbea,c19690b..e65a065 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -19,8 -13,9 +19,10 @@@ Merged from 2.0 * Make sure high level sstables get compacted (CASSANDRA-7414) * Fix AssertionError when using empty clustering columns and static columns (CASSANDRA-7455) + * Upgrade to snappy-java 1.0.5.2 (CASSANDRA-7476) + + 2.1.0-rc2 * Fix heap size calculation for CompoundSparseCellName and CompoundSparseCellName.WithCollection (CASSANDRA-7421)
