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 2014/08/06 20:34:17 UTC
[3/6] git commit: fix CHANGES
fix CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a633156b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a633156b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a633156b
Branch: refs/heads/trunk
Commit: a633156bf25222197837c5c3c43a269a42913d7d
Parents: d9b7d44
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 6 13:33:19 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 6 13:33:19 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a633156b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 78abb47..e1783b5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,12 +8,9 @@
* Fix UDT field selection with empty fields (CASSANDRA-7670)
* Bogus deserialization of static cells from sstable (CASSANDRA-7684)
Merged from 2.0:
- * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
- * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
- * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
- * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
* Update java driver (for hadoop) (CASSANDRA-7618)
+ * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)