You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2012/12/17 17:50:39 UTC
[3/3] git commit: Fix CHANGES.txt
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 <al...@apache.org>
Authored: Mon Dec 17 19:47:25 2012 +0300
Committer: Aleksey Yeschenko <al...@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