accumulo git commit: ACCUMULO-4124 run sub-jobs in local mode

Repository: accumulo Updated Branches: refs/heads/master 7be2f04e5 -> b4cd908a3 ACCUMULO-4124 run sub-jobs in local mode Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b4cd908a Tree:

accumulo git commit: ACCUMULO-4123 increment the counters properly

Repository: accumulo Updated Branches: refs/heads/master f1523abd5 -> 24ee37f90 ACCUMULO-4123 increment the counters properly Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24ee37f9 Tree:

accumulo git commit: ACCUMULO-4125 keep easymock in the mrit jar

Repository: accumulo Updated Branches: refs/heads/master 24ee37f90 -> 7be2f04e5 ACCUMULO-4125 keep easymock in the mrit jar Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7be2f04e Tree:

[14/21] accumulo git commit: ACCUMULO-4131 Clean up UTF_8 constants

ACCUMULO-4131 Clean up UTF_8 constants Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46958bf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46958bf7 Diff:

[15/21] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/Constants.java core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java test/src/test/java/org/apache/accumulo/harness/MiniClusterHarness.java

[04/21] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/util/Merge.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84d3e5c4 Tree:

[06/21] accumulo git commit: ACCUMULO-4130 Bump findbugs-maven-plugin to 3.0.3

ACCUMULO-4130 Bump findbugs-maven-plugin to 3.0.3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5125e4e4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5125e4e4 Diff:

[20/21] accumulo git commit: Merge branch '1.7'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c8088e9/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java -- diff --cc

[05/21] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Conflicts: core/src/main/java/org/apache/accumulo/core/util/Merge.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/84d3e5c4 Tree:

[13/21] accumulo git commit: ACCUMULO-4131 Clean up UTF_8 constants

ACCUMULO-4131 Clean up UTF_8 constants Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46958bf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46958bf7 Diff:

[03/21] accumulo git commit: ACCUMULO-4119 Use DataFileValue consistently

ACCUMULO-4119 Use DataFileValue consistently * Ensure DataFileValue encodes/decodes with UTF-8 * Ensure usage of DataFileValue instead of manual parsing * Provide more encoding utility methods (String, Value) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[21/21] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: core/src/test/java/org/apache/accumulo/core/util/ByteBufferUtilTest.java test/src/main/java/org/apache/accumulo/test/ConditionalWriterIT.java test/src/main/java/org/apache/accumulo/test/functional/DeleteIT.java

[11/21] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c696a90 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c696a90 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c696a90

[17/21] accumulo git commit: ACCUMULO-4131 Make more UTF_8 imports static

ACCUMULO-4131 Make more UTF_8 imports static Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a706b019 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a706b019 Diff:

[08/21] accumulo git commit: ACCUMULO-4130 Bump findbugs-maven-plugin to 3.0.3

ACCUMULO-4130 Bump findbugs-maven-plugin to 3.0.3 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5125e4e4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5125e4e4 Diff:

[02/21] accumulo git commit: ACCUMULO-4119 Use DataFileValue consistently

ACCUMULO-4119 Use DataFileValue consistently * Ensure DataFileValue encodes/decodes with UTF-8 * Ensure usage of DataFileValue instead of manual parsing * Provide more encoding utility methods (String, Value) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[19/21] accumulo git commit: Merge branch '1.7'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2c8088e9/test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java -- diff --cc test/src/main/java/org/apache/accumulo/test/functional/RestartStressIT.java

[12/21] accumulo git commit: ACCUMULO-4131 Clean up UTF_8 constants

ACCUMULO-4131 Clean up UTF_8 constants Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46958bf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46958bf7 Diff:

[09/21] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/668c340c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668c340c Diff:

[18/21] accumulo git commit: ACCUMULO-4131 Make more UTF_8 imports static

ACCUMULO-4131 Make more UTF_8 imports static Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a706b019 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a706b019 Diff:

[10/21] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/668c340c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/668c340c Diff:

[01/21] accumulo git commit: ACCUMULO-4119 Use DataFileValue consistently

Repository: accumulo Updated Branches: refs/heads/1.6 a95127d1d -> 46958bf7b refs/heads/1.7 6cc5ab56b -> a706b019a refs/heads/master b4cd908a3 -> 2c8088e99 ACCUMULO-4119 Use DataFileValue consistently * Ensure DataFileValue encodes/decodes with UTF-8 * Ensure usage of DataFileValue