Merge branch 'cassandra-1.2' into cassandra-2.0
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/ebd50ff2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ebd50ff2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ebd50ff2
Branch: refs/heads/trunk
Commit: ebd50ff2a95b6a1a9a48a25c0509f07d0fba8cd5
Parents: bee0b4b dbca6d6
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Oct 22 17:08:54 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Oct 22 17:08:54 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ebd50ff2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5abb16b,9e150b8..d60cff1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -227,7 -114,17 +227,15 @@@ Merged from 1.2
* (Hadoop) quote identifiers in CqlPagingRecordReader (CASSANDRA-5763)
* Add replace_node functionality for vnodes (CASSANDRA-5337)
* Add timeout events to query traces (CASSANDRA-5520)
- * make starting native protocol server idempotent (CASSANDRA-5728)
- * Fix loading key cache when a saved entry is no longer valid
(CASSANDRA-5706)
* Fix serialization of the LEFT gossip value (CASSANDRA-5696)
+ * Pig: support for cql3 tables (CASSANDRA-5234)
+ * cqlsh: Don't show 'null' in place of empty values (CASSANDRA-5675)
+ * Race condition in detecting version on a mixed 1.1/1.2 cluster
+ (CASSANDRA-5692)
+ * Fix skipping range tombstones with reverse queries (CASSANDRA-5712)
+ * Expire entries out of ThriftSessionManager (CASSANDRA-5719)
+ * Don't keep ancestor information in memory (CASSANDRA-5342)
+ * cqlsh: fix handling of semicolons inside BATCH queries (CASSANDRA-5697)
* Expose native protocol server status in nodetool info (CASSANDRA-5735)
* Fix pathetic performance of range tombstones (CASSANDRA-5677)
* Fix querying with an empty (impossible) range (CASSANDRA-5573)
