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/87d5c019 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87d5c019 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87d5c019 Branch: refs/heads/trunk Commit: 87d5c019ca713c328b5827a5bdf2eaf014ab21a0 Parents: a9ec0ac b248b1a Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Sep 8 19:41:08 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Sep 8 19:41:08 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/auth/AuthenticatedUser.java | 2 +- src/java/org/apache/cassandra/auth/DataResource.java | 6 +++--- src/java/org/apache/cassandra/auth/PermissionDetails.java | 6 +++--- src/java/org/apache/cassandra/config/TriggerDefinition.java | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
