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

2014-01-29 Thread vines
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/be26f791 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be26f791 Diff:

[2/2] 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:

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

2014-01-04 Thread elserj
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/feccaa4b Tree:

[2/2] 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: pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/652b5af3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/652b5af3 Diff:

[2/2] 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:

[2/2] 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:

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

2013-12-31 Thread ctubbsii
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/712e946d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/712e946d Diff:

[2/2] 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:

[2/2] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)

2013-12-27 Thread ctubbsii
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c1ea722 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c1ea722 Diff:

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

2013-12-20 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-env.sh conf/examples/1GB/standalone/accumulo-env.sh conf/examples/2GB/native-standalone/accumulo-env.sh conf/examples/2GB/standalone/accumulo-env.sh

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

2013-12-19 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/30938af5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/30938af5 Diff:

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

2013-12-18 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/security/SecurityUtil.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/001fdd69 Tree:

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

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

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

2013-12-12 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/480c964b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/480c964b Diff:

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

2013-12-05 Thread ctubbsii
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/00fb08b3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00fb08b3 Diff:

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

2013-12-04 Thread kturner
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: bin/config.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db1cc477 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db1cc477 Diff:

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

2013-12-04 Thread ecn
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1fa5573

[2/2] 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:

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

2013-11-22 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/fae82828 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fae82828 Diff:

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

2013-11-14 Thread ctubbsii
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/AccumuloSecurityException.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ac20fe06 Tree:

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

2013-11-08 Thread vines
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/TestUtils.py test/system/continuous/agitator.pl Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4227 Tree:

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

2013-10-15 Thread elserj
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: test/system/auto/simple/zooCacheTest.py ACCUMULO-1775 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b05bd8c Tree:

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

2013-09-22 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/7db1a446 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7db1a446 Diff:

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

2013-09-05 Thread ctubbsii
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT Conflicts: src/assemble/build.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f75be7d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f75be7d5