Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69397ef5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69397ef5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69397ef5 Branch: refs/heads/cassandra-2.0 Commit: 69397ef5f0a260d2b6c30e64da9441777639de6b Parents: bc12d73 7e02052 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 16 05:05:44 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 16 05:05:44 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(+) ----------------------------------------------------------------------
