cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject git commit: fix changes
Date Thu, 04 Sep 2014 23:57:55 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk b74342a8a -> b4839a388


fix changes


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

Branch: refs/heads/trunk
Commit: b4839a388b35dadc010345bdd13bd6454f35b945
Parents: b74342a
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Sep 4 18:57:51 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Sep 4 18:57:51 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4839a38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f87cf9..4c4fc2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -96,7 +96,6 @@ Merged from 2.0:
  * Don't send schema change responses and events for no-op DDL
    statements (CASSANDRA-7600)
  * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
->>>>>>> cassandra-2.1
  * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753)
  * Fix ALTER clustering column type from DateType to TimestampType when
    using DESC clustering order (CASSANRDA-7797)
@@ -200,7 +199,7 @@ Merged from 2.0:
  * Updated memtable_cleanup_threshold and memtable_flush_writers defaults 
    (CASSANDRA-7551)
  * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
- * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+ * Anti-compaction proceeds if any part of the repair failed (CASSANDRA-7521)
  * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539)
  * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527)
  * Fix configuration error message when running nodetool ring (CASSANDRA-7508)


Mime
View raw message