Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/450a653d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/450a653d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/450a653d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 450a653da2d1eb0f573c8820e6d82c821400b217 Parents: 9e32bf8 44eb7d4 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 15:48:34 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 15:48:34 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
