You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/02/19 23:24:58 UTC

[1/4] git commit: ACCUMULO-2385 fix error running test against hadoop 1.0

Repository: accumulo
Updated Branches:
  refs/heads/master dcc19ccba -> 206ee5516


ACCUMULO-2385 fix error running test against hadoop 1.0


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

Branch: refs/heads/master
Commit: 4dd2d662cabb8372acaba36d58820c804ecd53ed
Parents: eea885a
Author: Eric Newton <er...@gmail.com>
Authored: Wed Feb 19 17:21:43 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Feb 19 17:21:43 2014 -0500

----------------------------------------------------------------------
 test/system/auto/simple/mapreduce.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dd2d662/test/system/auto/simple/mapreduce.py
----------------------------------------------------------------------
diff --git a/test/system/auto/simple/mapreduce.py b/test/system/auto/simple/mapreduce.py
index a63df9a..5ac06e6 100755
--- a/test/system/auto/simple/mapreduce.py
+++ b/test/system/auto/simple/mapreduce.py
@@ -71,6 +71,7 @@ class MapReduceTest(TestUtilsMixin,unittest.TestCase):
         start = globa(os.path.join('lib','accumulo-start.jar'))
         jcommander = globa(os.path.join('lib','jcommander.jar'))
         trace = globa(os.path.join('lib','accumulo-trace.jar'))
+        guava = globa(os.path.join('lib','guava.jar'))
         zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*[!javadoc|src|bin].jar")
         self.createInputTableInAccumulo();
         #Arguments for the Example Class
@@ -83,7 +84,7 @@ class MapReduceTest(TestUtilsMixin,unittest.TestCase):
         #MapReduce class to run
         mapred_class= [self.accumulo_sh(),self.example_class_to_run]
         #classes needed to run the mapreduce
-        libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace,jcommander])]
+        libjars = ["-libjars",",".join([zkjar,thriftjar,examples,core,fate,trace,jcommander,guava])]
         cmd = mapred_class+libjars+arg_list
         if(self.isAccumuloRunning()):
             log.debug("COMMAND:"+str(cmd))


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

Posted by ec...@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/294fe255
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/294fe255
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/294fe255

Branch: refs/heads/master
Commit: 294fe2555bb535df0fedd0c2c23474c63c6bf3d1
Parents: d6a0e63 0b0ef70
Author: Eric Newton <er...@gmail.com>
Authored: Wed Feb 19 17:24:10 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Feb 19 17:24:10 2014 -0500

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

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



[4/4] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Posted by ec...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo


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

Branch: refs/heads/master
Commit: 206ee55160f42cc8ff6cb830393891b20cd02070
Parents: 294fe25 dcc19cc
Author: Eric Newton <er...@gmail.com>
Authored: Wed Feb 19 17:25:17 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Feb 19 17:25:17 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/Instance.java   |  36 +++---
 .../org/apache/accumulo/core/conf/Property.java |  87 +++++++-------
 .../accumulo/core/util/ValidatorTest.java       |   6 +-
 .../java/org/apache/accumulo/fate/Fate.java     |  67 ++++++-----
 .../server/master/state/ClosableIterator.java   |  23 ++++
 .../server/master/state/MetaDataStateStore.java |   3 +-
 .../master/state/MetaDataTableScanner.java      |   2 +-
 .../master/state/RootTabletStateStore.java      |   4 +-
 .../server/master/state/TabletStateStore.java   |   3 +-
 .../master/state/ZooTabletStateStore.java       |   8 +-
 .../server/watcher/MonitorLog4jWatcher.java     |  10 +-
 .../server/zookeeper/DistributedWorkQueue.java  |   2 +-
 .../accumulo/master/TabletGroupWatcher.java     |  15 ++-
 .../tserver/log/TabletServerLogger.java         | 112 ++++++++++---------
 .../tserver/TabletResourceManagerTest.java      |   8 +-
 15 files changed, 206 insertions(+), 180 deletions(-)
----------------------------------------------------------------------



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

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

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


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

Branch: refs/heads/master
Commit: 0b0ef70986d83e3d266137d4fbb4a6350233f282
Parents: 732f037 4dd2d66
Author: Eric Newton <er...@gmail.com>
Authored: Wed Feb 19 17:23:58 2014 -0500
Committer: Eric Newton <er...@gmail.com>
Committed: Wed Feb 19 17:23:58 2014 -0500

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

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