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/da199d9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da199d9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da199d9c Branch: refs/heads/master Commit: da199d9cbfd6db8ff535d088c74783428a6feb40 Parents: 209cc07 28bbb56 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Nov 14 21:54:07 2013 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Nov 14 21:54:07 2013 -0500 ---------------------------------------------------------------------- .../core/client/AccumuloSecurityException.java | 2 +- .../test/randomwalk/conditional/Init.java | 28 +++++++++++++++++--- .../test/randomwalk/conditional/Setup.java | 10 ++++--- .../test/randomwalk/conditional/Transfer.java | 15 ++++++++--- .../randomwalk/conf/modules/Conditional.xml | 14 +++++----- 5 files changed, 50 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
