Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1392992b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1392992b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1392992b Branch: refs/heads/master Commit: 1392992bd313075aadb11dffd912ce5084649080 Parents: 668c9e3 dda7a60 Author: Mike Drob <md...@cloudera.com> Authored: Fri Jun 13 11:32:08 2014 -0400 Committer: Mike Drob <md...@cloudera.com> Committed: Fri Jun 13 11:32:08 2014 -0400 ---------------------------------------------------------------------- test/system/scalability/run.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------