Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Conflicts:
test/system/auto/README.md
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a729c889
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a729c889
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a729c889
Branch: refs/heads/master
Commit: a729c8891ba736cd0a0bba26263b59fdcc0c9bba
Parents: d7f5b9e 32cca60
Author: Eric C. Newton <eric.new...@gmail.com>
Authored: Fri Mar 21 14:54:18 2014 -0400
Committer: Eric C. Newton <eric.new...@gmail.com>
Committed: Fri Mar 21 14:54:18 2014 -0400
----------------------------------------------------------------------
test/system/auto/README.md | 109 +++++++++++++++++++++++++++++++++
test/system/bench/README | 44 -------------
test/system/bench/README.md | 45 ++++++++++++++
test/system/continuous/README | 80 ------------------------
test/system/continuous/README.md | 81 ++++++++++++++++++++++++
test/system/randomwalk/README | 62 -------------------
test/system/randomwalk/README.md | 69 +++++++++++++++++++++
test/system/scalability/README | 38 ------------
test/system/scalability/README.md | 40 ++++++++++++
test/system/test1/README | 26 --------
test/system/test1/README.md | 29 +++++++++
test/system/test2/README | 7 ---
test/system/test2/README.md | 10 +++
test/system/test3/README | 2 -
test/system/test3/README.md | 5 ++
test/system/test4/README | 6 --
test/system/test4/README.md | 9 +++
17 files changed, 397 insertions(+), 265 deletions(-)
----------------------------------------------------------------------
