[2/5] git commit: ACCUMULO-3059 Allow configuration of truststore password and root keystore password

ACCUMULO-3059 Allow configuration of truststore password and root keystore password Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/384aa396 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/384aa396 Diff: http

[5/5] 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/ef0b27c1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ef0b27c1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ef0b27

[1/5] git commit: ACCUMULO-3059 Allow configuration of truststore password and root keystore password

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 10500f6da -> 011349e2d refs/heads/master 63b3bdd8c -> ef0b27c1e ACCUMULO-3059 Allow configuration of truststore password and root keystore password Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://

[4/5] git commit: ACCUMULO-3045 Fix some misleading logging messages

ACCUMULO-3045 Fix some misleading logging messages Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/011349e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/011349e2 Diff: http://git-wip-us.apache.org/repos/asf

[3/5] git commit: ACCUMULO-3045 Fix some misleading logging messages

ACCUMULO-3045 Fix some misleading logging messages Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/011349e2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/011349e2 Diff: http://git-wip-us.apache.org/repos/asf

git commit: ACCUMULO-3040 Add replication element to JMX configuration template

Repository: accumulo Updated Branches: refs/heads/master 51af1f17a -> 63b3bdd8c ACCUMULO-3040 Add replication element to JMX configuration template Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63b3bdd8 Tree: http:

[09/12] git commit: ACCUMULO-3058 Remove broken javadoc line

ACCUMULO-3058 Remove broken javadoc line Removes incorrect instructions referencing non-existent methods. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/814414a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/

[06/12] git commit: ACCUMULO-2967 Remove warning from unused assignment

ACCUMULO-2967 Remove warning from unused assignment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec531911 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec531911 Diff: http://git-wip-us.apache.org/repos/as

[04/12] git commit: ACCUMULO-2967 Remove warning from unused assignment

ACCUMULO-2967 Remove warning from unused assignment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec531911 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec531911 Diff: http://git-wip-us.apache.org/repos/as

[10/12] 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: server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java test/src/main/java/org/apache/accumulo/test/functional/RunTests.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/rep

[02/12] git commit: ACCUMULO-3013 Remove unused import left behind.

ACCUMULO-3013 Remove unused import left behind. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a31bf1c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a31bf1c4 Diff: http://git-wip-us.apache.org/repos/asf/ac

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51af1f17 Tree: http://git-wip-us.apache.org/rep

[01/12] git commit: ACCUMULO-3013 Remove unused import left behind.

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT f870d5100 -> 814414a82 refs/heads/1.6.1-SNAPSHOT 660429f2e -> 10500f6da refs/heads/master 3443794de -> 51af1f17a ACCUMULO-3013 Remove unused import left behind. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo C

[05/12] git commit: ACCUMULO-2967 Remove warning from unused assignment

ACCUMULO-2967 Remove warning from unused assignment Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ec531911 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ec531911 Diff: http://git-wip-us.apache.org/repos/as

[07/12] git commit: ACCUMULO-3058 Remove broken javadoc line

ACCUMULO-3058 Remove broken javadoc line Removes incorrect instructions referencing non-existent methods. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/814414a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/

[11/12] 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: server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java test/src/main/java/org/apache/accumulo/test/functional/RunTests.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/rep

[08/12] git commit: ACCUMULO-3058 Remove broken javadoc line

ACCUMULO-3058 Remove broken javadoc line Removes incorrect instructions referencing non-existent methods. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/814414a8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/

[03/12] git commit: ACCUMULO-3013 Remove unused import left behind.

ACCUMULO-3013 Remove unused import left behind. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a31bf1c4 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a31bf1c4 Diff: http://git-wip-us.apache.org/repos/asf/ac

[2/6] git commit: ACCUMULO-3048 Add in new fixes after rc0

ACCUMULO-3048 Add in new fixes after rc0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f870d510 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f870d510 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/

[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/3443794d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3443794d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/344379

[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: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/660429f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/660429f2 Diff: http://git-

[1/6] git commit: ACCUMULO-3048 Add in new fixes after rc0

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 17d3fd3ce -> f870d5100 refs/heads/1.6.1-SNAPSHOT 07bacc346 -> 660429f2e refs/heads/master a63ded99d -> 3443794de ACCUMULO-3048 Add in new fixes after rc0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit:

[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: CHANGES Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/660429f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/660429f2 Diff: http://git-

[3/6] git commit: ACCUMULO-3048 Add in new fixes after rc0

ACCUMULO-3048 Add in new fixes after rc0 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f870d510 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f870d510 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/