You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/09/03 19:13:07 UTC
[4/5] git commit: cleanup
cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/760e68f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/760e68f7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/760e68f7
Branch: refs/heads/trunk
Commit: 760e68f77c419f7eda3ac8eea59f42481d0f02f2
Parents: a353491
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Sep 3 12:10:44 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Sep 3 12:12:47 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/760e68f7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 82fea75..40cd5ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -64,6 +64,11 @@ Merged from 1.2:
* Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
* Fix buffer underflow on socket close (CASSANDRA-5792)
Merged from 1.2:
+ * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
+ * cqlsh: add collections support to COPY (CASSANDRA-5698)
+ * retry important messages for any IOException (CASSANDRA-5804)
+ * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626)
+ * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
* fix bulk-loading compressed sstables (CASSANDRA-5820)
* (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter
(CASSANDRA-5824)
@@ -88,14 +93,6 @@ Merged from 1.1:
* Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
-1.2.8
- * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
- * cqlsh: add collections support to COPY (CASSANDRA-5698)
- * retry important messages for any IOException (CASSANDRA-5804)
- * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626)
- * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
-
-
2.0.0-beta2
* Replace countPendingHints with Hints Created metric (CASSANDRA-5746)
* Allow nodetool with no args, and with help to run without a server (CASSANDRA-5734)