accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [11/12] accumulo git commit: Merge branch '1.5' into 1.6
Date Fri, 14 Nov 2014 01:17:14 GMT
Merge branch '1.5' into 1.6

Conflicts:
	test/system/bench/cloudstone1/cloudstone1.py


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2efeb52f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2efeb52f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2efeb52f

Branch: refs/heads/1.6
Commit: 2efeb52f86f774236a174df1e7c5b547608540fd
Parents: 27269c4 a8a6b15
Author: Josh Elser <elserj@apache.org>
Authored: Thu Nov 13 17:16:48 2014 -0800
Committer: Josh Elser <elserj@apache.org>
Committed: Thu Nov 13 17:16:48 2014 -0800

----------------------------------------------------------------------
 test/system/bench/cloudstone1/cloudstone1.py |  4 ++--
 test/system/bench/lib/TeraSortBenchmark.py   | 22 +++++++++++-----------
 test/system/bench/lib/slaves.py              |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2efeb52f/test/system/bench/cloudstone1/cloudstone1.py
----------------------------------------------------------------------
diff --cc test/system/bench/cloudstone1/cloudstone1.py
index 349bbdb,a615b59..ff5ecb7
--- a/test/system/bench/cloudstone1/cloudstone1.py
+++ b/test/system/bench/cloudstone1/cloudstone1.py
@@@ -29,10 -29,10 +29,10 @@@ class CloudStone1(Benchmark)
                 'and we can reach all the slaves. Lower is better.'
  
      def runTest(self):
 -        code, out, err = cloudshell.run(self.username, self.password, 'table !METADATA\nscan\n')
 -        self.assertEqual(code, 0, "Could not scan the !METADATA table. %s %s" % (out, err))
 +        code, out, err = cloudshell.run(self.username, self.password, 'table accumulo.metadata\nscan\n')
 +        self.assertEqual(code, 0, "Could not scan the metadata table. %s %s" % (out, err))
-         results = runAll('echo help | %s shell' %
-                          accumulo('bin', 'accumulo'))
+         results = runAll('echo help | %s shell -u %s -p %s' %
+                          (accumulo('bin', 'accumulo'), self.username, self.password))
                           
      def setSpeed(self, speed):
          "We want to override this method but no speed can be set"


Mime
View raw message