[4/4] 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/1078d65d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1078d65d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1078d6

[2/4] git commit: ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced

ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9ee274d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9ee274d Diff: http://git-wi

[3/4] git commit: ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced

ACCUMULO-2926 Fix the multiple slf4j bindings that ACCUMULO-2808 introduced Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9ee274d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9ee274d Diff: http://git-wi

[1/4] git commit: ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 8f1dc6528 -> d9ee274dc refs/heads/master 4d7e90aee -> 1078d65da ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader Project: http://git-wip-us.apache.org/repos/asf/accu

[3/6] git commit: ACCUMULO-2925 Need to preserve replicationSource on the Mutation

ACCUMULO-2925 Need to preserve replicationSource on the Mutation The replicationSource on the Mutation is the information which prevents cycles in the replication graph from infinitely replicating information. Each replicationSource on a Mutation is the `replication.name` for a system from which

[5/6] git commit: ACCUMULO-2925 Add test to ensure that replicationSource(s) are preserved before replay

ACCUMULO-2925 Add test to ensure that replicationSource(s) are preserved before replay Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/06760572 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/06760572 Diff: h

[2/6] git commit: ACCUMULO-2925 Create regular Mutations from ServerMutations when applying replication data on a peer

ACCUMULO-2925 Create regular Mutations from ServerMutations when applying replication data on a peer Mutations do not store unserialized ColumnUpdates, but only generate them on demand via the getter. This is intended to create an efficient implementation (both performance and size) while presevi

[1/6] git commit: ACCUMULO-2925 Don't recalculate the name multiple times.

Repository: accumulo Updated Branches: refs/heads/master 61bf188ce -> 4d7e90aee ACCUMULO-2925 Don't recalculate the name multiple times. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d6683a0 Tree: http://git-wip-u

[4/6] git commit: ACCUMULO-2925 Remove inadvertently deleted log message

ACCUMULO-2925 Remove inadvertently deleted log message Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cc7f91b0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cc7f91b0 Diff: http://git-wip-us.apache.org/repos

[6/6] git commit: ACCUMULO-2925 Add warning about server-assigned timestamps with replication

ACCUMULO-2925 Add warning about server-assigned timestamps with replication Leave a note about updates to equal keys that have different updates that are assigned the same timestamp by the server. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/

git commit: ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 344b4d3a3 -> 8f1dc6528 ACCUMULO-2930: Update classes still using AccumuloClassLoader.getClassLoader() to use AccumuloVFSClassLoader Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[7/7] git commit: Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT

Merge remote-tracking branch 'origin/1.5.2-SNAPSHOT' into 1.5.2-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d81b8db3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d81b8db3 Diff: http://git-wip-u

[2/7] git commit: ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig.

ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig. Also includes some formatting changes. Includes some basic tests to make sure hashCode and equals are functioning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

[3/7] git commit: ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig.

ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig. Also includes some formatting changes. Includes some basic tests to make sure hashCode and equals are functioning. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61bf188c Tree: http://git-wip-us.apache.org/rep

[4/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 Conflicts: core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/344b4d3a Tree: http://git-w

[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 Conflicts: core/src/main/java/org/apache/accumulo/core/client/BatchWriterConfig.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/344b4d3a Tree: http://git-w

[1/7] git commit: ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT b304ed7f9 -> d81b8db30 refs/heads/1.6.1-SNAPSHOT c86b067bf -> 344b4d3a3 refs/heads/master e23a543c0 -> 61bf188ce ACCUMULO-2928 Add equals, hashCode and toString to batchwriterconfig. Also includes some formatting changes. Inc

[2/4] git commit: ACCUMULO-2927 More targeted git ignores (per-module)

ACCUMULO-2927 More targeted git ignores (per-module) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c86b067b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c86b067b Diff: http://git-wip-us.apache.org/repos/a

[4/4] git commit: ACCUMULO-2927 Add .gitignore for mapreduce and shell modules

ACCUMULO-2927 Add .gitignore for mapreduce and shell modules Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e23a543c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e23a543c Diff: http://git-wip-us.apache.org

[1/4] git commit: ACCUMULO-2927 More targeted git ignores (per-module)

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 3fafd2381 -> c86b067bf refs/heads/master 7e01de524 -> e23a543c0 ACCUMULO-2927 More targeted git ignores (per-module) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/

[3/4] 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/4b99e946 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b99e946 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b99e9

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: core/src/main/java/org/apache/accumulo/core/Constants.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e01de52 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/

[1/3] git commit: ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 93574178c -> 3fafd2381 refs/heads/master bc7b5ff37 -> 7e01de524 ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accum

[2/3] git commit: ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final

ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fafd238 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fafd238 Diff: http://git-wip-us.apache.org/repos/asf/ac