Updated Branches: refs/heads/trunk df1df221e -> 2eaea5a2a
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2eaea5a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2eaea5a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2eaea5a2 Branch: refs/heads/trunk Commit: 2eaea5a2a44f9e8370776de997048ef38a88be97 Parents: df1df22 f7f0100 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Mon Dec 17 18:41:41 2012 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Dec 17 18:41:41 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/2eaea5a2/CHANGES.txt ----------------------------------------------------------------------
