[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46ab1f61 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46ab1f61 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46ab1f

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ceb1a74d Tree: http

[2/6] git commit: ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit.

ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f848178e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f848178e Diff: http://git-wip-us.apach

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ceb1a74d Tree: http

[3/6] git commit: ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit.

ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f848178e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f848178e Diff: http://git-wip-us.apach

[1/6] git commit: ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 641d42cd1 -> f848178e7 refs/heads/1.6.1-SNAPSHOT f08bbfee2 -> ceb1a74d0 refs/heads/master c45315a76 -> 46ab1f616 ACCUMULO-3015 Ensure table name is serialized in RangeInputSplit. Project: http://git-wip-us.apache.org/repos/a

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

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c45315a7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c45315a7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c45315

[1/3] git commit: ACCUMULO-3017 Replace setTable(String) and getTable() methods to RangeInputSplit.

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT af224c2e4 -> f08bbfee2 refs/heads/master 3f43c48db -> c45315a76 ACCUMULO-3017 Replace setTable(String) and getTable() methods to RangeInputSplit. Inadvertently renamed without a deprecation marking in 1.6.0 Project: http://g

[2/3] git commit: ACCUMULO-3017 Replace setTable(String) and getTable() methods to RangeInputSplit.

ACCUMULO-3017 Replace setTable(String) and getTable() methods to RangeInputSplit. Inadvertently renamed without a deprecation marking in 1.6.0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f08bbfee Tree: http://git-w

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af224c2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af224c2e Diff: http://git-wip-us.apache.org/repos/asf/

[2/6] git commit: ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M

ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/641d42cd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/641d42cd Diff: http://git-wip-

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/af224c2e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af224c2e Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] git commit: ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 10950b54c -> 641d42cd1 refs/heads/1.6.1-SNAPSHOT c9d884fa5 -> af224c2e4 refs/heads/master daa0dcdfc -> 3f43c48db ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M Project: http://git-wip-us.apache.org

[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3f43c48d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3f43c48d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3f43c4

[3/6] git commit: ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M

ACCUMULO-3018 Increase default tserver.mutation.queue.max from 256K to 1M Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/641d42cd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/641d42cd Diff: http://git-wip-

[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: test/system/auto/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c9d884fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[2/6] git commit: ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar

ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar We don't bundle javadoc or sources in the assemble anymore so there is no reason to try to use the glob to exclude those. Also, the version string is also not included in the artifacts which make it even more straightforw

[1/6] git commit: ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 87c609d77 -> 10950b54c refs/heads/1.6.1-SNAPSHOT e7c64d477 -> c9d884fa5 refs/heads/master 449746792 -> daa0dcdfc ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar We don't bundle javadoc or sources

[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/daa0dcdf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/daa0dcdf Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/daa0dc

[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Conflicts: test/system/auto/simple/examples.py Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c9d884fa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tre

[3/6] git commit: ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar

ACCUMULO-3016 Remove glob and use explicit file name for examples-simple jar We don't bundle javadoc or sources in the assemble anymore so there is no reason to try to use the glob to exclude those. Also, the version string is also not included in the artifacts which make it even more straightforw

git commit: ACCUMULO-2872 synchronize access to lastCompactId

Repository: accumulo Updated Branches: refs/heads/master 78f1c1429 -> 449746792 ACCUMULO-2872 synchronize access to lastCompactId Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44974679 Tree: http://git-wip-us.apach

[1/7] git commit: ACCUMULO-1832 fix typos

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 1967a294e -> 87c609d77 refs/heads/1.6.1-SNAPSHOT 59426a029 -> e7c64d477 refs/heads/master 3ab214822 -> 78f1c1429 ACCUMULO-1832 fix typos Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us

[5/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7c64d47 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7c64d47 Diff: http://git-wip-us.apache.org/repos/asf/

[2/7] git commit: ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify

ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify In 1.6, the CounterUtils class in server no longer exists, in favor of the inlined method that was done in this commit. This alleviates modification of the continuous-ingest scripts to launch jobs. The CounterUtils clas

[7/7] git commit: Merge branch '1.6.1-SNAPSHOT'

Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78f1c142 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78f1c142 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78f1c1

[3/7] git commit: ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify

ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify In 1.6, the CounterUtils class in server no longer exists, in favor of the inlined method that was done in this commit. This alleviates modification of the continuous-ingest scripts to launch jobs. The CounterUtils clas

[6/7] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7c64d47 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7c64d47 Diff: http://git-wip-us.apache.org/repos/asf/

[4/7] git commit: ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify

ACCUMULO-3013 Inline reflection for Counter increment within ContinuousVerify In 1.6, the CounterUtils class in server no longer exists, in favor of the inlined method that was done in this commit. This alleviates modification of the continuous-ingest scripts to launch jobs. The CounterUtils clas

git commit: ACCUMULO-1832 fix typos

Repository: accumulo Updated Branches: refs/heads/master 0e2178447 -> 3ab214822 ACCUMULO-1832 fix typos Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ab21482 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/t

git commit: ACCUMULO-1832 fix typos

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT fc4e98307 -> 59426a029 ACCUMULO-1832 fix typos Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59426a02 Tree: http://git-wip-us.apache.org/repos/asf/ac