Merge branch 'cassandra-3.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/676054a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/676054a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/676054a5 Branch: refs/heads/trunk Commit: 676054a55aee1d06acf8e2e5ec89e0a97636020c Parents: 5d11021 cfb7ec1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 25 12:48:54 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 25 12:48:54 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/676054a5/CHANGES.txt ----------------------------------------------------------------------
