Merge branch 'cassandra-2.0' into cassandra-2.1 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/8436ee61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8436ee61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8436ee61 Branch: refs/heads/trunk Commit: 8436ee6166d78b6bfd604d35e7cebc066aeaff24 Parents: c108ce5 e2c74d5 Author: Mikhail Stepura <mish...@apache.org> Authored: Fri May 30 11:00:05 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Fri May 30 11:00:05 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7603f88,c3145eb..139c41c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -80,11 -46,11 +80,12 @@@ Merged from 2.0 * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950) * Invalid key cache entries on DROP (CASSANDRA-6525) * Fix flapping RecoveryManagerTest (CASSANDRA-7084) + * Add missing iso8601 patterns for date strings (CASSANDRA-6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * Add authentication support to shuffle (CASSANDRA-6484) + * Swap local and global default read repair chances (CASSANDRA-7320) + * Add conditional CREATE/DROP USER support (CASSANDRA-7264) ++ * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8436ee61/bin/cqlsh ----------------------------------------------------------------------