Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 38421872c -> 3ee27fb1a
  refs/heads/trunk 4d3562f61 -> 1ae5e01c0


Fix CHANGES.txt


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

Branch: refs/heads/cassandra-2.2
Commit: 3ee27fb1a5a5d94f33533f316c5b65f6cb5aad27
Parents: 3842187
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Jun 11 11:19:54 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Jun 11 11:19:54 2015 +0200

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ee27fb1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e0447e9..3163351 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2
+ * Add functions to convert timeuuid to date or time, deprecate dateOf and 
unixTimestampOf (CASSANDRA-9229)
  * Make sure we cancel non-compacting sstables from LifecycleTransaction 
(CASSANDRA-9566)
 
 
@@ -24,7 +25,6 @@
  * Revert CASSANDRA-7807 (tracing completion client notifications) 
(CASSANDRA-9429)
  * Add ability to stop compaction by ID (CASSANDRA-7207)
  * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
- * Add functions to convert timeuuid to date or time, deprecate dateOf and 
unixTimestampOf (CASSANDRA-9229)
 Merged from 2.1:
  * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
  * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)

Reply via email to