Updated Branches: refs/heads/cassandra-1.2 10959ef3a -> f7f01007b
Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7f01007 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7f01007 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7f01007 Branch: refs/heads/cassandra-1.2 Commit: f7f01007bcfe06763845241e432ec8d72955fd40 Parents: 10959ef 63902c6 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Dec 17 18:40:48 2012 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Dec 17 18:40:48 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 12 +++++++++--- .../apache/cassandra/auth/SimpleAuthorizer.java | 10 +++++----- pylib/cqlshlib/tracing.py | 6 ++++-- 4 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f01007/CHANGES.txt ----------------------------------------------------------------------
