Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0dd3438a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dd3438a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dd3438a Branch: refs/heads/trunk Commit: 0dd3438ac1eaae0e62bcebf7b13f56707dfc5cda Parents: 8f243a9 69397ef Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 16 05:06:22 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 16 05:06:22 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/Auth.java | 3 +++ src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 3 +++ 2 files changed, 6 insertions(+) ----------------------------------------------------------------------
