[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6a3845a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6a3845a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6a3845a Branch: refs/heads/trunk Commit: d6a3845a212422c26192a61fe42a3b7e21d34e10 Parents: ac9f478 1772b1c Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Dec 28 18:32:36 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Dec 28 18:32:36 2012 +0300 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 22 ++- 2 files changed, 4 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6a3845a/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4700edb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4700edb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4700edb Branch: refs/heads/trunk Commit: f4700edb4821fbfe33d0b9e6041f1a5fa3f5880c Parents: ead0662 986893e Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Dec 20 16:12:56 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Dec 20 16:12:56 2012 +0100 -- CHANGES.txt|4 +++ src/java/org/apache/cassandra/cql3/ParsedType.java | 22 +++ 2 files changed, 26 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4700edb/CHANGES.txt -- diff --cc CHANGES.txt index 4f095f1,45b0b5b..401a9af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,22 @@@ +1.2.1 + * fix hinting for dropped local writes (CASSANDRA-4753) + * off-heap cache doesn't need mutable column container (CASSANDRA-5057) + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + * Log compaction merge counts (CASSANDRA-4894) + + + 1.2.0 + * Disallow counters in collections (CASSANDRA-5082) + ++ 1.2.0-rc2 * fix nodetool ownership display with vnodes (CASSANDRA-5065) * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63c5a9e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63c5a9e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63c5a9e2 Branch: refs/heads/trunk Commit: 63c5a9e2b83b7e99d844d6ea4d061794196c4e58 Parents: 7532d5c bc598b5 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Dec 18 18:20:16 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Dec 18 18:20:16 2012 +0100 -- CHANGES.txt |1 + bin/cassandra-shuffle| 57 + bin/shuffle | 57 - debian/cassandra.install |1 + 4 files changed, 59 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63c5a9e2/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10959ef3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10959ef3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10959ef3 Branch: refs/heads/trunk Commit: 10959ef3ab9da7a46abe6b71ef06145c1979ea71 Parents: 38aa459 9b217e4 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Dec 17 11:31:15 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Dec 17 11:31:15 2012 +0100 -- CHANGES.txt|3 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 99 +-- src/java/org/apache/cassandra/db/DefsTable.java|5 +- src/java/org/apache/cassandra/db/Memtable.java | 12 -- src/java/org/apache/cassandra/db/Table.java|6 +- .../apache/cassandra/service/StorageService.java |6 +- .../org/apache/cassandra/streaming/StreamOut.java |6 +- 7 files changed, 36 insertions(+), 101 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10959ef3/CHANGES.txt -- diff --cc CHANGES.txt index 97353ba,327d427..000429a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ +1.2.1 + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + - 1.2.0 + 1.2.0-rc2 * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064) Merged from 1.1: * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061) * Fix ALTER TABLE overriding compression options with defaults http://git-wip-us.apache.org/repos/asf/cassandra/blob/10959ef3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7532d5cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7532d5cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7532d5cb Branch: refs/heads/trunk Commit: 7532d5cbfb0d5059a38cf64f90a253a9edaf2c64 Parents: 3e70d3a b7c4de9 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Dec 17 19:49:07 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Dec 17 19:49:07 2012 +0300 -- CHANGES.txt |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7532d5cb/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63743835 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63743835 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63743835 Branch: refs/heads/trunk Commit: 637438355c10db4c7a9ae56442a788b36e1bd59e Parents: db9eb04 f562f0b Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Dec 13 00:11:01 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Dec 13 00:11:01 2012 +0300 -- CHANGES.txt |4 bin/cqlsh | 14 +- 2 files changed, 17 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63743835/CHANGES.txt -- diff --cc CHANGES.txt index 2a70cec,d73849c..ba0177b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,7 +1,17 @@@ +1.2.1 + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + + 1.2.0 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060) + + 1.2-rc1 * rename rpc_timeout settings to request_timeout (CASSANDRA-5027) * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40762aec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40762aec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40762aec Branch: refs/heads/trunk Commit: 40762aec09288fc13c317381d83b067d6294808e Parents: 6374383 1bb78b0 Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Dec 13 04:35:43 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Dec 13 04:35:43 2012 +0300 -- .../org/apache/cassandra/config/CFMetaData.java|2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/956fa776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/956fa776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/956fa776 Branch: refs/heads/trunk Commit: 956fa77689f44a4a4f7c2b57ba1eb38e06eb7527 Parents: f563076 d6ccfb5 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Dec 10 09:47:18 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Dec 10 09:47:18 2012 +0100 -- CHANGES.txt |1 + src/java/org/apache/cassandra/cql3/Cql.g |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/956fa776/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a01bc1a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a01bc1a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a01bc1a Branch: refs/heads/trunk Commit: 9a01bc1a2dd98e75a67c3d5ffb38a6cec0d112b4 Parents: eeb7965 9210d57 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Dec 10 18:05:54 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Dec 10 18:05:54 2012 +0300 -- CHANGES.txt|1 + pylib/cqlshlib/cql3handling.py | 93 +- 2 files changed, 58 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a01bc1a/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8752bfa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8752bfa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8752bfa5 Branch: refs/heads/trunk Commit: 8752bfa5a00821bef28f79acdc12cd3893342f82 Parents: 5f399ca 35a653c Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Dec 10 22:00:41 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Dec 10 22:00:41 2012 +0300 -- src/java/org/apache/cassandra/auth/Auth.java | 14 +++--- .../org/apache/cassandra/cql3/QueryProcessor.java | 12 ++-- .../cql3/statements/AlterUserStatement.java|4 ++-- .../cql3/statements/CreateUserStatement.java |4 ++-- .../cql3/statements/DropUserStatement.java |4 ++-- 5 files changed, 15 insertions(+), 23 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cd66d7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cd66d7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cd66d7d Branch: refs/heads/trunk Commit: 0cd66d7dc7a26390a6154528af000ac0bc7cecae Parents: 24154fc 62b9037 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Dec 8 19:40:30 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Dec 8 19:40:30 2012 +0300 -- src/java/org/apache/cassandra/auth/Auth.java | 28 +++ .../org/apache/cassandra/cql3/QueryProcessor.java |6 +++- .../cql3/statements/AlterUserStatement.java|3 +- .../cql3/statements/CreateUserStatement.java |3 +- .../cql3/statements/DropUserStatement.java |3 +- 5 files changed, 32 insertions(+), 11 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5630763 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5630763 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5630763 Branch: refs/heads/trunk Commit: f5630763986254d15560cf96e8e51b10a708c5b0 Parents: 0cd66d7 dbbca5e Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Dec 8 20:47:35 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Dec 8 20:47:35 2012 +0300 -- src/java/org/apache/cassandra/auth/Auth.java | 22 +++- 1 files changed, 16 insertions(+), 6 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4154434c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4154434c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4154434c Branch: refs/heads/trunk Commit: 4154434cfb5522a988684418afc28d9fafe43db0 Parents: 5c9572e a90b310 Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Dec 6 08:41:28 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Dec 6 08:41:28 2012 +0100 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/Cql.g |9 +- .../cassandra/cql3/operations/ColumnOperation.java |7 ++ .../cassandra/cql3/operations/ListOperation.java | 61 ++- .../cassandra/cql3/operations/MapOperation.java| 29 +++ .../cassandra/cql3/operations/Operation.java |3 + .../cql3/operations/PreparedOperation.java |6 ++ .../cassandra/cql3/operations/SetOperation.java|8 ++ .../cassandra/cql3/statements/BatchStatement.java |2 +- .../cassandra/cql3/statements/DeleteStatement.java | 23 +- .../cql3/statements/ModificationStatement.java |2 +- .../cassandra/cql3/statements/UpdateStatement.java | 14 +-- 12 files changed, 143 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4154434c/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5e70594 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5e70594 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5e70594 Branch: refs/heads/trunk Commit: a5e70594be2c2a3876c0871d0f41181e6ee47118 Parents: 114651b ab5c06f Author: Aleksey Yeschenko alek...@apache.org Authored: Thu Nov 29 22:52:39 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu Nov 29 22:52:39 2012 +0300 -- CHANGES.txt|2 ++ pylib/cqlshlib/cql3handling.py | 10 -- 2 files changed, 10 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5e70594/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a92236a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a92236a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a92236a Branch: refs/heads/trunk Commit: 3a92236a249a6f8a0808736e5171b9debdb2a979 Parents: fbd6400 25d9537 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Nov 28 13:56:58 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Nov 28 13:56:58 2012 +0300 -- pylib/cqlshlib/cql3handling.py | 15 +-- 1 files changed, 9 insertions(+), 6 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3479c636 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3479c636 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3479c636 Branch: refs/heads/trunk Commit: 3479c636baee9af58b742e4af80512823f9be138 Parents: c235229 b4f2f20 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 21 09:14:03 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 21 09:14:03 2012 +0100 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/Cql.g | 39 +++-- .../cassandra/cql3/operations/ColumnOperation.java | 27 +--- .../cassandra/cql3/operations/ListOperation.java | 83 +++-- .../cassandra/cql3/operations/MapOperation.java| 24 ++- .../cassandra/cql3/operations/Operation.java |9 +- .../cql3/operations/PreparedOperation.java | 143 +++ .../cassandra/cql3/operations/SetOperation.java| 44 - .../cassandra/cql3/statements/UpdateStatement.java | 25 +-- 9 files changed, 298 insertions(+), 97 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3479c636/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/445c4fae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/445c4fae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/445c4fae Branch: refs/heads/trunk Commit: 445c4fae940e8fb79b91e289fe571c0e11e142ae Parents: 3479c63 e39bf7a Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 21 12:38:23 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 21 12:38:23 2012 +0100 -- .../cassandra/cql3/statements/SelectStatement.java |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4452eeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4452eeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4452eeb Branch: refs/heads/trunk Commit: a4452eeb168fd081100c633f9d2914c9c8aec48a Parents: 445c4fa a32eb9f Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 21 14:04:19 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 21 14:04:19 2012 +0100 -- CHANGES.txt|1 + .../cassandra/cql3/statements/SelectStatement.java | 11 ++--- .../cassandra/db/AbstractColumnContainer.java |9 +-- .../apache/cassandra/db/CollationController.java |5 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |8 ++-- .../org/apache/cassandra/db/RangeSliceCommand.java | 20 src/java/org/apache/cassandra/db/Row.java | 11 ++-- .../org/apache/cassandra/db/SliceQueryPager.java |5 +- .../apache/cassandra/db/filter/ExtendedFilter.java | 38 +++--- .../cassandra/db/filter/IDiskAtomFilter.java | 12 +++-- .../cassandra/db/filter/NamesQueryFilter.java | 41 ++- .../cassandra/db/filter/SliceQueryFilter.java | 12 - .../cassandra/db/index/SecondaryIndexManager.java |4 +- .../cassandra/db/index/SecondaryIndexSearcher.java |2 +- .../db/index/composites/CompositesSearcher.java|8 ++-- .../cassandra/db/index/keys/KeysSearcher.java |4 +- .../cassandra/service/RangeSliceVerbHandler.java |4 +- .../cassandra/service/RowRepairResolver.java |6 +- .../org/apache/cassandra/service/StorageProxy.java | 24 + .../apache/cassandra/db/ColumnFamilyStoreTest.java |2 +- 20 files changed, 139 insertions(+), 88 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4452eeb/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9deba21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9deba21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9deba21 Branch: refs/heads/trunk Commit: a9deba21100388f605f9373386d71567a069d5ef Parents: a4452ee e2df26b Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 21 17:25:20 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 21 17:25:20 2012 +0100 -- CHANGES.txt|1 + .../src/org/apache/cassandra/stress/Session.java |2 +- .../org/apache/cassandra/stress/StressAction.java |1 - .../stress/operations/CqlCounterAdder.java | 21 + .../stress/operations/CqlCounterGetter.java| 23 +-- .../stress/operations/CqlIndexedRangeSlicer.java | 18 +-- .../cassandra/stress/operations/CqlInserter.java | 19 +--- .../stress/operations/CqlRangeSlicer.java | 20 + .../cassandra/stress/operations/CqlReader.java | 17 --- 9 files changed, 84 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9deba21/CHANGES.txt --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb577447 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb577447 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb577447 Branch: refs/heads/trunk Commit: fb577447bc9604dbba2a9cd83263d7c6306c0810 Parents: a9deba2 9366fb3 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Nov 21 20:17:53 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Nov 21 20:17:53 2012 +0100 -- .../apache/cassandra/service/StorageService.java |2 -- .../apache/cassandra/db/RecoveryManager2Test.java |4 2 files changed, 4 insertions(+), 2 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6875c3bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6875c3bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6875c3bf Branch: refs/heads/trunk Commit: 6875c3bf85f0662be1b910c157aed0ba1e721214 Parents: 791affd 9db8827 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Nov 19 21:55:57 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Nov 19 21:55:57 2012 +0300 -- CHANGES.txt |1 + bin/cqlsh | 46 ++ 2 files changed, 47 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6875c3bf/CHANGES.txt -- diff --cc CHANGES.txt index 7c61ec5,e63350b..c14a0d8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +1.2.1 + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + 1.2-rc1 + * make consistency level configurable in cqlsh (CASSANDRA-4829) * fix cqlsh rendering of blob fields (CASSANDRA-4970) * fix cqlsh DESCRIBE command (CASSANDRA-4913) * save truncation position in system table (CASSANDRA-4906)
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6acbc86d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6acbc86d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6acbc86d Branch: refs/heads/trunk Commit: 6acbc86ddfea2c781aba84f2b8dfd7f8f842fdc2 Parents: 2a41dcd c3173d4 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Nov 19 05:52:10 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Nov 19 05:52:10 2012 +0300 -- bin/cqlsh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/763465b2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/763465b2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/763465b2 Branch: refs/heads/trunk Commit: 763465b29894df99077a3824bf9c239aea25c1d1 Parents: f18de00 34dc2f3 Author: Aleksey Yeschenko alek...@apache.org Authored: Sat Nov 17 21:11:22 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sat Nov 17 21:11:22 2012 +0300 -- CHANGES.txt |1 + pylib/cqlshlib/formatting.py |4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/763465b2/CHANGES.txt -- diff --cc CHANGES.txt index 03bf61f,7f5a487..9148c9e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,12 -1,5 +1,13 @@@ +1.2.1 + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + + 1.2-rc1 + * fix cqlsh rendering of blob fields (CASSANDRA-4970) * fix cqlsh DESCRIBE command (CASSANDRA-4913) * save truncation position in system table (CASSANDRA-4906) * Move CompressionMetadata off-heap (CASSANDRA-4937)
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a93de3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a93de3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a93de3b Branch: refs/heads/trunk Commit: 1a93de3b35c51fef8e9687bfc7b513438e6a9453 Parents: 763465b b226ae5 Author: Dave Brosius dbros...@apache.org Authored: Sat Nov 17 20:52:11 2012 -0500 Committer: Dave Brosius dbros...@apache.org Committed: Sat Nov 17 20:52:11 2012 -0500 -- .../org/apache/cassandra/cli/CliHelp.yaml |4 1 files changed, 4 insertions(+), 0 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d17c6f2a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d17c6f2a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d17c6f2a Branch: refs/heads/trunk Commit: d17c6f2afe60d80dbc2467330c6f1bb1c1bca15c Parents: 2f3b8d4 f8b939a Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Nov 16 12:38:34 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Nov 16 12:38:34 2012 +0100 -- NEWS.txt |3 +++ doc/cql3/CQL.textile |6 +- src/java/org/apache/cassandra/cql3/Cql.g |2 +- 3 files changed, 5 insertions(+), 6 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cc554e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cc554e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cc554e9 Branch: refs/heads/cassandra-1.2 Commit: 0cc554e93b749992580d1e037b542fa9195105de Parents: 2f3b8d4 8dd1d56 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Nov 16 16:36:14 2012 -0600 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Nov 16 16:36:14 2012 -0600 -- NEWS.txt |3 +++ doc/cql3/CQL.textile |6 +- .../cli/transport/FramedTransportFactory.java |5 - src/java/org/apache/cassandra/cql3/Cql.g |2 +- 4 files changed, 9 insertions(+), 7 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/30c5b816 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30c5b816 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30c5b816 Branch: refs/heads/trunk Commit: 30c5b81683d3ec57b0b87290b396f66b6215c514 Parents: 489355d 01c9e10 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Nov 13 09:04:48 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Nov 13 09:04:48 2012 +0100 -- .../org/apache/cassandra/config/CFMetaData.java|1 + src/java/org/apache/cassandra/db/SystemTable.java |5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) --
[2/3] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6e846c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6e846c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6e846c1 Branch: refs/heads/trunk Commit: e6e846c134da0740a5e6844c4933d131d43c36e3 Parents: 9a2ea9a 94fa825 Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Tue Nov 13 10:45:05 2012 -0800 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Tue Nov 13 10:45:05 2012 -0800 -- .../cassandra/cache/ConcurrentLinkedHashCache.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
