Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b33559c7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33559c7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33559c7 Branch: refs/heads/1.5.1-SNAPSHOT Commit: b33559c71eedb984b80fe70272e4035099a922dc Parents: 5fe2ccc 4d8977c Author: John Vines <vi...@apache.org> Authored: Thu Jan 30 18:28:22 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Thu Jan 30 18:28:22 2014 -0500 ---------------------------------------------------------------------- test/system/bench/lib/path.py | 7 +++++++ test/system/bench/lib/slaves.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
