Updated Branches:
refs/heads/trunk e692c1b04 -> f425c9251
Merge branch 'cassandra-1.2' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f425c925
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f425c925
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f425c925
Branch: refs/heads/trunk
Commit: f425c92513c117e8347b8118a0e319ef72c71a62
Parents: e692c1b d0f7e9e
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Feb 12 21:19:18 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Feb 12 21:19:18 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
conf/cassandra.yaml | 5 ++
.../apache/cassandra/auth/AuthenticatedUser.java | 22 ++++++++
src/java/org/apache/cassandra/config/Config.java | 1 +
.../cassandra/config/DatabaseDescriptor.java | 5 ++
.../cassandra/cql3/statements/BatchStatement.java | 17 +------
.../org/apache/cassandra/service/ClientState.java | 42 ++++++++++++++-
.../apache/cassandra/thrift/CassandraServer.java | 8 +---
8 files changed, 77 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f425c925/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc5e0d8,466dca6..a850c6b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,7 -15,7 +23,8 @@@
* add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
* CQL3 refactor to allow conversion function (CASSANDRA-5226)
* Fix drop of sstables in some circumstance (CASSANDRA-5232)
+ * Add support for LZ4 compression (CASSANDRA-5038)
+ * Implement caching of authorization results (CASSANDRA-4295)
1.2.1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f425c925/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f425c925/src/java/org/apache/cassandra/config/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f425c925/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f425c925/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
