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

2014-01-09 Thread kturner
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0f626d9 Tree: htt

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

2014-01-03 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/2GB/standalone/accumulo-site.xml Also update the vfs-classloader general.classpaths example to match the rest of the examples Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-

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

2014-01-03 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/536211b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/536211b3 Diff: http://git-wip-us.apache.org/repos/asf/

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

2014-01-02 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db1ebe4c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db1ebe4c Diff: http://git-

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

2013-12-27 Thread ujustgotbilld
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/74495249 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/74495249 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-12-26 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/start/src/test/resources/ClassLoaderTestA/Test.jar src/start/src/test/resources/ClassLoaderTestB/Test.jar src/start/src/test/resources/ClassLoaderTestC/Test.jar test/system/auto/TestCombinerX.jar

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

2013-12-03 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/747c7cdb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/747c7cdb Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-11-26 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64aab864 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64aab864 Diff: http://git-wip-us.apache.org/repos/asf/

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

2013-11-25 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java test/system/auto/simple/examples.py In addition to merging from 1.4 also fixed a lot of issues with examples functional t

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

2013-09-20 Thread cjnolet
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/032099e8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/032099e8 Diff: http://git-wip-us.apache.org/repos/asf/