[5/6] git commit: Merge branch '1.5' into 1.6

2014-10-27 Thread elserj
Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41fc5fbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41fc5fbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41fc5fbc

[1/6] git commit: ACCUMULO-3271 Add splits to a table after it is created in MultiNode module.

2014-10-27 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.5 351c70eb2 -> d3d6986e5 refs/heads/1.6 6f3a356ba -> 41fc5fbc2 refs/heads/master 65cc3d355 -> 4d6176b39 ACCUMULO-3271 Add splits to a table after it is created in MultiNode module. Project: http://git-wip-us.apache.org/repos/asf/accumulo

[3/6] git commit: ACCUMULO-3271 Add splits to a table after it is created in MultiNode module.

2014-10-27 Thread elserj
ACCUMULO-3271 Add splits to a table after it is created in MultiNode module. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3d6986e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3d6986e Diff: http://git-w

[6/6] git commit: Merge branch '1.6'

2014-10-27 Thread elserj
Merge branch '1.6' Conflicts: test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTable.java test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CreateTable.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip

[2/6] git commit: ACCUMULO-3271 Add splits to a table after it is created in MultiNode module.

2014-10-27 Thread elserj
ACCUMULO-3271 Add splits to a table after it is created in MultiNode module. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3d6986e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3d6986e Diff: http://git-w

[4/6] git commit: Merge branch '1.5' into 1.6

2014-10-27 Thread elserj
Merge branch '1.5' into 1.6 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/41fc5fbc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/41fc5fbc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/41fc5fbc

[3/3] git commit: Merge branch '1.6'

2014-10-27 Thread ctubbsii
Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65cc3d35 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65cc3d35 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65cc3d35 Branch:

[1/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

2014-10-27 Thread ctubbsii
Repository: accumulo Updated Branches: refs/heads/1.6 e4dbe897c -> 6f3a356ba refs/heads/master 014d9d955 -> 65cc3d355 ACCUMULO-2984 Remove unused javadoc tags (no description) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumu

[2/3] git commit: ACCUMULO-2984 Remove unused javadoc tags (no description)

2014-10-27 Thread ctubbsii
ACCUMULO-2984 Remove unused javadoc tags (no description) Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6f3a356b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f3a356b Diff: http://git-wip-us.apache.org/re

[1/3] git commit: ACCUMULO-3264 Only reset logging configuration when we're certain that we have configuration files

2014-10-27 Thread elserj
Repository: accumulo Updated Branches: refs/heads/1.6 8b93f5d18 -> e4dbe897c refs/heads/master b97527181 -> 014d9d955 ACCUMULO-3264 Only reset logging configuration when we're certain that we have configuration files The original change broke logging for all of the ITs because the logging c

[3/3] git commit: Merge branch '1.6'

2014-10-27 Thread elserj
Merge branch '1.6' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/014d9d95 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/014d9d95 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/014d9d95 Branch:

[2/3] git commit: ACCUMULO-3264 Only reset logging configuration when we're certain that we have configuration files

2014-10-27 Thread elserj
ACCUMULO-3264 Only reset logging configuration when we're certain that we have configuration files The original change broke logging for all of the ITs because the logging configuration was reset without having any means to add back the original log4j configuration from maven. This shouldn't hav