[3/3] git commit: Fix CHANGES.txt

2013-08-21 Thread aleksey 
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/c8b220ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8b220ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8b220ba

Branch: refs/heads/cassandra-2.0.0
Commit: c8b220ba10ff248238777ed1a627f1bc55261049
Parents: 26d0535
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 21 18:46:59 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 21 18:46:59 2013 +0300

--
 CHANGES.txt | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8b220ba/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index b966e0c..fdee261 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,8 @@ Merged from 1.2:
  * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
  * Don't announce schema version until we've loaded the changes locally
(CASSANDRA-5904)
+ * Fix to support off heap bloom filters size greater than 2 GB 
(CASSANDRA-5903)
+ * Properly handle parsing huge map and set literals (CASSANDRA-5893)
 
 
 2.0.0-rc2
@@ -45,15 +47,7 @@ Merged from 1.2:
  * Future-proof inter-major-version schema migrations (CASSANDRA-5845)
  * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
(CASSANDRA-5718)
- * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
- * cqlsh: add support for multiline comments (CASSANDRA-5798)
- * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
-   (CASSANDRA-5856)
- * Don't announce schema version until we've loaded the changes locally
-   (CASSANDRA-5904)
  * Add -no-snapshot option to scrub (CASSANDRA-5891)
- * Fix to support off heap bloom filters size greater than 2 GB 
(CASSANDRA-5903)
- * Properly handle parsing huge map and set literals (CASSANDRA-5893)
 Merged from 1.1:
  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)

[3/3] git commit: Fix CHANGES.txt

2012-12-17 Thread aleksey 
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/b7c4de92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7c4de92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7c4de92

Branch: refs/heads/trunk
Commit: b7c4de924dd68eee32afce65d6f59576468d52cd
Parents: 63902c6
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Dec 17 19:47:25 2012 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Dec 17 19:47:25 2012 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7c4de92/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 26097f8..5b5ab49 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,12 +1,12 @@
 1.2.0-rc2
  * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
  * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
+ * Fix SimpleAuthorizer example (CASSANDRA-5072)
+ * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 Merged from 1.1:
  * fix temporarily missing schema after upgrade from pre-1.1.5 (CASSANDRA-5061)
  * Fix ALTER TABLE overriding compression options with defaults
(CASSANDRA-4996, CASSANDRA-5066)
- * Fix SimpleAuthorizer example (CASSANDRA-5072)
- * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 
 
 1.2-rc1