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/341e60b8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/341e60b8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/341e60b8
Branch: refs/heads/master
Commit: 341e60b88e261f22112f7828eb8d7fb909cf72c2
Parents: 3ce79a9 bcb0905
Author: Bill Havanki <bhava...@cloudera.com>
Authored: Fri Mar 21 14:49:58 2014 -0400
Committer: Bill Havanki <bhava...@cloudera.com>
Committed: Fri Mar 21 14:49:58 2014 -0400
----------------------------------------------------------------------
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 ++++
16 files changed, 288 insertions(+), 265 deletions(-)
----------------------------------------------------------------------
