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 2012/03/13 17:57:06 UTC

[6/6] git commit: r/m duplicate entries

r/m duplicate entries


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d6174cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d6174cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d6174cf

Branch: refs/heads/cassandra-1.1
Commit: 2d6174cfac2b36d41c9249bea1032480be662179
Parents: 0d68043
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Mar 13 11:56:39 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Mar 13 11:56:39 2012 -0500

----------------------------------------------------------------------
 CHANGES.txt |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d6174cf/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 554cbfb..693cf25 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,10 +23,6 @@
    serialization for schema (CASSANDRA-3792)
  * add missing column validator options to the CLI help (CASSANDRA-3926)
 Merged from 1.0:
- * remove the wait on hint future during write (CASSANDRA-3870)
- * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
- * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
- * Fix short read protection (CASSANDRA-3934)
  * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
  * delete hints from dropped ColumnFamilies on handoff instead of
    erroring out (CASSANDRA-3975)