[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c8bef781 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8bef781 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8bef781 Branch: refs/heads/cassandra-2.0 Commit: c8bef781671b206bc590ce02997190047d39dd1a Parents: 2383430 6ad62c3 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 28 12:33:08 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 28 12:33:08 2013 +0200 -- CHANGES.txt | 1 + .../cql3/statements/ModificationStatement.java | 12 +--- src/java/org/apache/cassandra/db/SystemKeyspace.java| 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8bef781/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8bef781/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e49261b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e49261b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e49261b4 Branch: refs/heads/cassandra-2.0 Commit: e49261b46f8db7ccee4205b6dc54741e5d2cc73e Parents: db381ea c284786 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 27 10:50:45 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 27 10:50:45 2013 +0200 -- test/unit/org/apache/cassandra/service/QueryPagerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6034d989 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6034d989 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6034d989 Branch: refs/heads/cassandra-2.0 Commit: 6034d989ce08347a28edf9346d498e44e7e2731c Parents: 0c37db6 625d43f Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 26 18:53:34 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 26 18:53:34 2013 +0300 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/db/marshal/DateType.java | 7 +++ 2 files changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6034d989/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f664786 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f664786 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f664786 Branch: refs/heads/cassandra-2.0 Commit: 9f664786449ad0d208579e1cb4db3988cbbcac7a Parents: 1a3cd2a 65cd580 Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Aug 25 00:24:49 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Aug 25 00:24:49 2013 +0300 -- src/java/org/apache/cassandra/db/Memtable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78d78cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78d78cf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78d78cf6 Branch: refs/heads/cassandra-2.0 Commit: 78d78cf649d65ad16fdcbc54bb69f6b23bd7f2e6 Parents: 56008de b0280cb Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 24 02:17:38 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 24 02:17:38 2013 +0300 -- CHANGES.txt | 1 + .../apache/cassandra/db/ColumnFamilyStore.java | 22 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d78cf6/CHANGES.txt -- diff --cc CHANGES.txt index 2d30407,b68e442..988255b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ +2.0.1 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + * Add ability for CQL3 to list partition keys (CASSANDRA-4536) + * Improve native protocol serialization (CASSANDRA-5664) + + 2.0.0 * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931) Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) * Don't announce schema version until we've loaded the changes locally http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d78cf6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a3cd2a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a3cd2a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a3cd2a5 Branch: refs/heads/cassandra-2.0 Commit: 1a3cd2a54e7f00ad8e0f145bf0b3b9a2daccab9b Parents: f31c668 cc10724 Author: Dave Brosius dbros...@apache.org Authored: Fri Aug 23 20:51:22 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Fri Aug 23 20:51:22 2013 -0400 -- src/java/org/apache/cassandra/streaming/ConnectionHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e0279f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e0279f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e0279f8 Branch: refs/heads/cassandra-2.0 Commit: 2e0279f89ab0c404d25e2c04882ca1892d408b92 Parents: d35c823 7a300c2 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 21 09:03:28 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 21 09:03:28 2013 +0200 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e0279f8/CHANGES.txt -- diff --cc CHANGES.txt index fe5908a,3cae204..551de18 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +2.0.1 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614) + * Log Merkle tree stats (CASSANDRA-2698) + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) + * Improve offheap memcpy performance (CASSANDRA-5884) + * Use a range aware scanner for cleanup (CASSANDRA-2524) + * Cleanup doesn't need to inspect sstables that contain only local data + (CASSANDRA-5722) + + 2.0.0 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138) Merged from 1.2: * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900) * Don't announce schema version until we've loaded the changes locally
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857a7f5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857a7f5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/857a7f5f Branch: refs/heads/cassandra-2.0 Commit: 857a7f5fb8246aa2d588c3ff257109b14f35be2f Parents: c4f6be8 8f367fd Author: Marcus Eriksson marc...@spotify.com Authored: Wed Aug 21 14:52:25 2013 +0200 Committer: Marcus Eriksson marc...@spotify.com Committed: Wed Aug 21 14:52:25 2013 +0200 -- .../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/857a7f5f/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37a67929 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37a67929 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37a67929 Branch: refs/heads/cassandra-2.0 Commit: 37a67929556527089b2719ff20cbd920edaa4e7e Parents: 0d769b9 8551ff9 Author: Dave Brosius dbros...@apache.org Authored: Wed Aug 21 20:49:20 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Wed Aug 21 20:49:20 2013 -0400 -- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6213cc89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6213cc89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6213cc89 Branch: refs/heads/cassandra-2.0 Commit: 6213cc89c94c9df1c480f541a194da0fe0edb6f6 Parents: 37a6792 5fe46e1 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Aug 22 04:36:25 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Aug 22 04:36:25 2013 +0300 -- NEWS.txt| 3 ++ interface/cassandra.thrift | 30 +--- .../cassandra/thrift/CassandraServer.java | 16 +++ 3 files changed, 39 insertions(+), 10 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1af59e39 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1af59e39 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1af59e39 Branch: refs/heads/cassandra-2.0 Commit: 1af59e39e2525420d65012eb4cbf2552f1646075 Parents: 7b9ae6a 5774ecb Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Wed Aug 21 19:33:18 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Wed Aug 21 19:33:18 2013 -0700 -- test/unit/org/apache/cassandra/utils/BloomFilterTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3993be8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3993be8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3993be8 Branch: refs/heads/cassandra-2.0 Commit: c3993be8b1eb5d1ac4ca36f3cdd1b26af9636d7e Parents: 1521ab0 1a2208a Author: Dave Brosius dbros...@apache.org Authored: Sun Aug 18 01:01:34 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Sun Aug 18 01:01:34 2013 -0400 -- src/java/org/apache/cassandra/triggers/TriggerExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1cc50f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1cc50f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1cc50f6 Branch: refs/heads/cassandra-2.0 Commit: c1cc50f6997349a03f4f5e0fe24b46c614ccde44 Parents: dd13281 a2006b6 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 14 20:58:40 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 14 20:58:40 2013 +0300 -- src/java/org/apache/cassandra/db/DefsTables.java | 9 - 1 file changed, 9 deletions(-) --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfadbb8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfadbb8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfadbb8b Branch: refs/heads/cassandra-2.0 Commit: cfadbb8b5fc9d7891cf57ae1ebe37936a4e7c24f Parents: e472ba4 703bd68 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 12 12:57:00 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 12 12:57:00 2013 +0200 -- CHANGES.txt | 1 + bin/cqlsh | 43 ++- pylib/cqlshlib/cql3handling.py | 281 --- pylib/cqlshlib/test/test_cqlsh_output.py| 5 +- .../cql3/statements/CreateIndexStatement.java | 2 +- .../cql3/statements/SelectStatement.java| 116 .../CompositesIndexOnClusteringKey.java | 5 +- 7 files changed, 135 insertions(+), 318 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfadbb8b/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b87270b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b87270b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b87270b3 Branch: refs/heads/cassandra-2.0 Commit: b87270b3915887720677e4f20eea21b79a32c811 Parents: cfadbb8 09a4dc0 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 12 17:07:12 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 12 17:07:12 2013 +0200 -- CHANGES.txt | 1 + NEWS.txt | 2 ++ bin/cqlsh| 27 +++ pylib/cqlshlib/test/test_cqlsh_output.py | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b87270b3/CHANGES.txt --
[2/2] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8c94eb2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8c94eb2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8c94eb2f Branch: refs/heads/cassandra-2.0 Commit: 8c94eb2fe3f931fd7be42dd5b0dc9717476f54b4 Parents: bb3f09c 2bcfab0 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 9 17:52:42 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 9 17:52:42 2013 +0200 -- pylib/cqlshlib/cql3handling.py | 17 +- .../org/apache/cassandra/cql3/CFPropDefs.java | 24 +--- .../org/apache/cassandra/cql3/KSPropDefs.java | 8 +++ 3 files changed, 10 insertions(+), 39 deletions(-) --
