Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/simple/examples.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d63cf6fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d63cf6fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d63cf6fe
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d63cf6fe57ccc788e4b3a4ce3b187f0b252784e6
Parents: 89c9962 1ad1151
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Tue Dec 31 17:33:35 2013 -0500
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Tue Dec 31 17:33:35 2013 -0500
----------------------------------------------------------------------
test/system/auto/simple/examples.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d63cf6fe/test/system/auto/simple/examples.py
----------------------------------------------------------------------
diff --cc test/system/auto/simple/examples.py
index 3ba425e,f05e58f..ba05174
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@@ -128,10 -124,10 +128,10 @@@ class Examples(TestUtilsMixin, unittest
self.comment("Creating a sharded index of the accumulo java files")
self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
self.execute('/bin/sh', '-c',
- 'find server -name "*.java" | xargs ./bin/accumulo
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p
%s --partitions 30' %
- (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
- 'find %s/src -name "*.java" | xargs %s/bin/accumulo
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
++ 'find %s/server -name "*.java" | xargs %s/bin/accumulo
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p
%s --partitions 30' %
+ (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME,
ZOOKEEPERS, ROOT, ROOT_PASSWORD))
self.execute(self.accumulo_sh(),
'org.apache.accumulo.examples.simple.shard.Query',
- INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
+ '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard',
'-u', ROOT, '-p', ROOT_PASSWORD,
'foo', 'bar')
self.comment("Creating a word index of the sharded files")
self.execute(self.accumulo_sh(),
'org.apache.accumulo.examples.simple.shard.Reverse',
