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/2b89cf6a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b89cf6a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b89cf6a
Branch: refs/heads/cassandra-2.1
Commit: 2b89cf6a8c0491ec6b389512a085195e389ab3c6
Parents: 02d1e74 1104653
Author: Mikhail Stepura <[email protected]>
Authored: Mon Apr 21 14:54:07 2014 -0700
Committer: Mikhail Stepura <[email protected]>
Committed: Mon Apr 21 14:54:07 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d6d13c5,bcbde4a..5d15eac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -98,7 -57,6 +98,8 @@@ Merged from 2.0
(CASSANDRA-6906)
* Fix SSTable not released if stream session fails (CASSANDRA-6818)
* Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+ * Queries on compact tables can return more rows that requested
(CASSANDRA-7052)
++ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
Merged from 1.2:
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b89cf6a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
----------------------------------------------------------------------
