Merge branch '1.5.2-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32cca604 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32cca604 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32cca604 Branch: refs/heads/master Commit: 32cca6049e7518b536dc4c13f48abc5ca8f1d099 Parents: 31b01e9 bcb0905 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Mar 21 14:52:31 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Mar 21 14:52:31 2014 -0400 ---------------------------------------------------------------------- .../server/conf/ServerConfiguration.java | 1 - test/system/auto/README | 104 ------------------ 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 ++ 19 files changed, 397 insertions(+), 370 deletions(-) ----------------------------------------------------------------------
