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

2014-02-26 Thread ctubbsii
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59716f06 Tree:

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

2014-02-18 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/dd7e5932 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd7e5932 Diff:

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

2014-01-28 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java server/src/main/java/org/apache/accumulo/server/master/Master.java Project:

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

2014-01-17 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/c35b70c6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c35b70c6 Diff:

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

2014-01-13 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/0ab78c64 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0ab78c64 Diff:

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

2014-01-09 Thread kturner
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloConfig.java

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

2014-01-03 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/766eb223 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/766eb223 Diff:

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

2014-01-03 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: conf/examples/1GB/native-standalone/accumulo-site.xml conf/examples/1GB/standalone/accumulo-site.xml conf/examples/2GB/native-standalone/accumulo-site.xml conf/examples/2GB/standalone/accumulo-site.xml

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

2014-01-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-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/9524e817 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9524e817 Diff:

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

2013-12-12 Thread ecn
Merge branch '1.5.1-SNAPSHOT' into 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/99ad86d3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/99ad86d3 Diff:

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

2013-12-06 Thread ctubbsii
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: examples/simple/pom.xml Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/352dc1b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/352dc1b8

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

2013-12-03 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/b5227cf3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b5227cf3 Diff:

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

2013-12-02 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java Project:

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

2013-11-27 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/387fcfbe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/387fcfbe Diff:

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

2013-11-26 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 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/294bed95 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/294bed95 Diff:

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

2013-11-13 Thread elserj
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: test/system/auto/TestUtils.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/050e7e25 Tree:

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

2013-11-08 Thread ctubbsii
Merge branch '1.5.1-SNAPSHOT' into 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/c68066db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c68066db Diff: