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/3f918e23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f918e23 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f918e23 Branch: refs/heads/trunk Commit: 3f918e23321d6bcf0ae5fde012e415f836fa5d73 Parents: b77fdcc dccc91d Author: Brandon Williams <[email protected]> Authored: Tue Oct 8 05:07:23 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Oct 8 05:07:23 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/Auth.java | 11 ++++++++++- .../apache/cassandra/auth/PasswordAuthenticator.java | 12 ++++++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3f918e23/CHANGES.txt ----------------------------------------------------------------------
