You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/29 22:47:15 UTC

[1/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 6716227f4 -> 613da730a
  refs/heads/1.6.0-SNAPSHOT 3eccc3533 -> 7e95b3fa7
  refs/heads/master 5e6da84c4 -> 92e2f8e48


ACCUMULO-2275 Fix options for LotsOfTablets


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 613da730acebe19dc6d278a1a4ef0bd010683078
Parents: 6716227
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:59:12 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:59:12 2014 -0500

----------------------------------------------------------------------
 test/system/auto/simple/tablets.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/613da730/test/system/auto/simple/tablets.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/tablets.py b/test/system/auto/simple/tablets.py
index e3e952d..ecf40f7 100755
--- a/test/system/auto/simple/tablets.py
+++ b/test/system/auto/simple/tablets.py
@@ -20,7 +20,7 @@ import unittest
 import time
 from subprocess import PIPE
 
-from TestUtils import TestUtilsMixin
+from TestUtils import ROOT, ROOT_PASSWORD, TestUtilsMixin
 
 log = logging.getLogger('test.auto')
 
@@ -42,11 +42,11 @@ class LotsOfTablets(TestUtilsMixin, unittest.TestCase):
         # initialize the database
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               [str(N)])
+		               ['-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
 	self.waitForStop(handle, WAIT)
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               ['-readonly', str(N)])
+		               ['-readonly', '-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
         self.waitForStop(handle, WAIT)
 
 def suite():


[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/system/auto/simple/tablets.py


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

Branch: refs/heads/master
Commit: 7e95b3fa7c21a4ccdd0049a8b83220d8f555e154
Parents: 3eccc35 613da73
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 16:46:41 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 16:46:41 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Posted by el...@apache.org.
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/system/auto/simple/tablets.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7e95b3fa7c21a4ccdd0049a8b83220d8f555e154
Parents: 3eccc35 613da73
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 16:46:41 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 16:46:41 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[3/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

Posted by el...@apache.org.
ACCUMULO-2275 Fix options for LotsOfTablets


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

Branch: refs/heads/master
Commit: 613da730acebe19dc6d278a1a4ef0bd010683078
Parents: 6716227
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:59:12 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:59:12 2014 -0500

----------------------------------------------------------------------
 test/system/auto/simple/tablets.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/613da730/test/system/auto/simple/tablets.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/tablets.py b/test/system/auto/simple/tablets.py
index e3e952d..ecf40f7 100755
--- a/test/system/auto/simple/tablets.py
+++ b/test/system/auto/simple/tablets.py
@@ -20,7 +20,7 @@ import unittest
 import time
 from subprocess import PIPE
 
-from TestUtils import TestUtilsMixin
+from TestUtils import ROOT, ROOT_PASSWORD, TestUtilsMixin
 
 log = logging.getLogger('test.auto')
 
@@ -42,11 +42,11 @@ class LotsOfTablets(TestUtilsMixin, unittest.TestCase):
         # initialize the database
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               [str(N)])
+		               ['-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
 	self.waitForStop(handle, WAIT)
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               ['-readonly', str(N)])
+		               ['-readonly', '-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
         self.waitForStop(handle, WAIT)
 
 def suite():


[2/6] git commit: ACCUMULO-2275 Fix options for LotsOfTablets

Posted by el...@apache.org.
ACCUMULO-2275 Fix options for LotsOfTablets


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 613da730acebe19dc6d278a1a4ef0bd010683078
Parents: 6716227
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 15:59:12 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 15:59:12 2014 -0500

----------------------------------------------------------------------
 test/system/auto/simple/tablets.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/613da730/test/system/auto/simple/tablets.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/tablets.py b/test/system/auto/simple/tablets.py
index e3e952d..ecf40f7 100755
--- a/test/system/auto/simple/tablets.py
+++ b/test/system/auto/simple/tablets.py
@@ -20,7 +20,7 @@ import unittest
 import time
 from subprocess import PIPE
 
-from TestUtils import TestUtilsMixin
+from TestUtils import ROOT, ROOT_PASSWORD, TestUtilsMixin
 
 log = logging.getLogger('test.auto')
 
@@ -42,11 +42,11 @@ class LotsOfTablets(TestUtilsMixin, unittest.TestCase):
         # initialize the database
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               [str(N)])
+		               ['-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
 	self.waitForStop(handle, WAIT)
         handle = self.runClassOn(self.masterHost(), 
 		               'org.apache.accumulo.test.CreateTestTable', 
-		               ['-readonly', str(N)])
+		               ['-readonly', '-count', str(N), '-u', ROOT, '-p', ROOT_PASSWORD])
         self.waitForStop(handle, WAIT)
 
 def suite():


[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'


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

Branch: refs/heads/master
Commit: 92e2f8e4822210d3034a89db910f6143e7b5b3f9
Parents: 5e6da84 7e95b3f
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 29 16:47:02 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 29 16:47:02 2014 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------