Merge branch '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/e9fe0226 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e9fe0226 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e9fe0226 Branch: refs/heads/master Commit: e9fe022664ff9e75f88a517044267b848434e389 Parents: 4879e7c 5117947 Author: Bill Havanki <bhava...@cloudera.com> Authored: Mon Feb 3 17:38:47 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Mon Feb 3 17:38:47 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/randomwalk/concurrent/ChangePermissions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
