[3/3] 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/f31c668f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f31c668f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f31c668f Branch: refs/heads/cassandra-2.0 Commit: f31c668f264945c3db0ac79827b62090a8af6b7c Parents: 78d78cf 9a42e28 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 24 03:27:16 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 24 03:27:16 2013 +0300 -- pylib/cqlshlib/cql3handling.py | 2 +- src/java/org/apache/cassandra/cql3/Cql.g | 16 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31c668f/pylib/cqlshlib/cql3handling.py -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f31c668f/src/java/org/apache/cassandra/cql3/Cql.g --
[3/3] 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/05929c05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05929c05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05929c05 Branch: refs/heads/cassandra-2.0 Commit: 05929c05cd06b29917fdaada7d39284ceff8d720 Parents: da55d76 624a7a0 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Aug 22 10:18:36 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Aug 22 10:18:36 2013 +0200 -- CHANGES.txt | 1 + NEWS.txt| 1 + bin/sstablesplit| 50 debian/cassandra.install| 1 + .../cassandra/db/compaction/CompactionTask.java | 14 +- .../db/compaction/SSTableSplitter.java | 105 .../cassandra/tools/StandaloneSplitter.java | 256 +++ 7 files changed, 426 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05929c05/CHANGES.txt --
[3/3] 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/ed79c143 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed79c143 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed79c143 Branch: refs/heads/cassandra-2.0 Commit: ed79c143995f98f25860e626d13dd8261c1150be Parents: 05929c0 af9c707 Author: Dave Brosius dbros...@apache.org Authored: Thu Aug 22 21:18:53 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Thu Aug 22 21:18:53 2013 -0400 -- bin/nodetool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[3/3] 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/c4f6be8c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4f6be8c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4f6be8c Branch: refs/heads/cassandra-2.0 Commit: c4f6be8c47cb1ea343f5bf2b14cf1173e57c8bcc Parents: 2e0279f cd47182 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 21 12:16:23 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 21 12:16:23 2013 +0200 -- doc/cql3/CQL.textile | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) --
[3/3] 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/f3bb8237 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3bb8237 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3bb8237 Branch: refs/heads/cassandra-2.0 Commit: f3bb8237a60fa07d2cb42a60130e3e2cf479a675 Parents: 6213cc8 372af08 Author: Dave Brosius dbros...@apache.org Authored: Wed Aug 21 21:51:51 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Wed Aug 21 21:51:51 2013 -0400 -- lib/licenses/commons-collections-3.2.1.txt | 202 lib/licenses/jetty-6.1.21.txt | 202 lib/licenses/jetty-util-6.1.21.txt | 202 3 files changed, 606 deletions(-) --
[3/3] 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/7b9ae6a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b9ae6a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b9ae6a0 Branch: refs/heads/cassandra-2.0 Commit: 7b9ae6a0375d52d18944ad9274f4c5f01ca5a42a Parents: f3bb823 ed6a5b9 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Wed Aug 21 19:24:28 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Wed Aug 21 19:24:28 2013 -0700 -- .../cassandra/utils/obs/OffHeapBitSet.java | 5 ++- .../apache/cassandra/utils/BloomFilterTest.java | 36 2 files changed, 40 insertions(+), 1 deletion(-) --
[3/3] 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/fb9b3d57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb9b3d57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb9b3d57 Branch: refs/heads/cassandra-2.0 Commit: fb9b3d57dc7a664a96b75f5a0ddc29497b3bbe98 Parents: 83feb94 3a7d9f8 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 20 16:48:16 2013 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 20 16:48:16 2013 +0200 -- CHANGES.txt | 11 +++ src/java/org/apache/cassandra/db/DefsTables.java | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9b3d57/CHANGES.txt --
[3/3] 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/e0238974 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0238974 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0238974 Branch: refs/heads/cassandra-2.0 Commit: e02389747cf265e589c7487ad832f20163ac3ece Parents: fb9b3d5 33fda2d Author: Dave Brosius dbros...@apache.org Authored: Tue Aug 20 17:53:43 2013 -0400 Committer: Dave Brosius dbros...@apache.org Committed: Tue Aug 20 17:53:43 2013 -0400 -- CHANGES.txt| 3 +++ src/java/org/apache/cassandra/db/ColumnFamilyStore.java| 6 -- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- src/java/org/apache/cassandra/service/StorageServiceMBean.java | 4 ++-- src/java/org/apache/cassandra/tools/NodeCmd.java | 5 - src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 6 files changed, 17 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0238974/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0238974/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[3/3] 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/4625ba6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4625ba6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4625ba6c Branch: refs/heads/cassandra-2.0 Commit: 4625ba6c409414d7131598a6d769b95a8bbb34fc Parents: e023897 ea7bc14 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Tue Aug 20 15:54:12 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Tue Aug 20 15:54:12 2013 -0700 -- .../org/apache/cassandra/utils/obs/OffHeapBitSet.java| 11 +-- src/java/org/apache/cassandra/utils/obs/OpenBitSet.java | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) --
[3/3] 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/d35c823c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d35c823c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d35c823c Branch: refs/heads/cassandra-2.0 Commit: d35c823ca805586c353319efcef96062fe43d1c6 Parents: 4625ba6 667ec27 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Tue Aug 20 16:24:25 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Tue Aug 20 16:24:25 2013 -0700 -- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d35c823c/CHANGES.txt --
[3/3] 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/11f0085b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11f0085b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11f0085b Branch: refs/heads/cassandra-2.0 Commit: 11f0085be02bfe5e0d70e6122a239760e4c2149f Parents: 62b709f 21771df Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 17 18:47:49 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 17 18:47:49 2013 +0300 -- CHANGES.txt | 2 ++ .../cql3/statements/SelectStatement.java| 32 2 files changed, 14 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11f0085b/CHANGES.txt --
[3/3] 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/62b709fa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62b709fa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62b709fa Branch: refs/heads/cassandra-2.0 Commit: 62b709fa169fe0cc41264b8cc457b7ef969d04a2 Parents: 69397ef 0ad0031 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Aug 16 21:51:08 2013 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Aug 16 21:51:08 2013 +0300 -- CHANGES.txt| 1 + pylib/cqlshlib/cql3handling.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b709fa/CHANGES.txt --
[3/3] 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/58d8dd40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d8dd40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d8dd40 Branch: refs/heads/cassandra-2.0 Commit: 58d8dd40c377088c7f45eeaacefbfe5641c88d81 Parents: 9a154a9 56bd81a Author: Aleksey Yeschenko alek...@apache.org Authored: Tue Aug 13 20:57:53 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Tue Aug 13 20:57:53 2013 +0200 -- --
[3/3] 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/e472ba4a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e472ba4a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e472ba4a Branch: refs/heads/cassandra-2.0 Commit: e472ba4aa36d4cd78440896891846800c7e986c5 Parents: 1485758 1c606bb Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 12 12:40:15 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 12 12:40:15 2013 +0200 -- pylib/cqlshlib/cql3handling.py | 4 src/java/org/apache/cassandra/config/CFMetaData.java | 2 -- 2 files changed, 6 deletions(-) --
[3/3] 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/9806b776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9806b776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9806b776 Branch: refs/heads/cassandra-2.0 Commit: 9806b7761fa035665959bc3a7434d535021c7d7d Parents: 839cc33 1716054 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 12 19:19:24 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 12 19:19:24 2013 +0200 -- src/java/org/apache/cassandra/config/CFMetaData.java | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) --
[3/3] 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/27ccae88 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27ccae88 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27ccae88 Branch: refs/heads/cassandra-2.0 Commit: 27ccae88200073289e40a4569a046f4743b7f309 Parents: 9abead4 298e91d Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Aug 10 02:42:51 2013 +0200 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Aug 10 02:42:51 2013 +0200 -- doc/cql3/CQL.textile | 8 1 file changed, 4 insertions(+), 4 deletions(-) --
