[2/6] git commit: ACCUMULO-2332 More whitespace altercations

ACCUMULO-2332 More whitespace altercations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24c04450 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24c04450 Diff: http://git-wip-us.apache.org/repos/asf/accumul

[3/6] git commit: ACCUMULO-2332 More whitespace altercations

ACCUMULO-2332 More whitespace altercations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24c04450 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24c04450 Diff: http://git-wip-us.apache.org/repos/asf/accumul

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d42417d Tree: http://

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

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

[1/6] git commit: ACCUMULO-2332 More whitespace altercations

Updated Branches: refs/heads/1.5.1-SNAPSHOT 6730880db -> 24c044505 refs/heads/1.6.0-SNAPSHOT 1f3751309 -> 2d42417d7 refs/heads/master 2d58bbd37 -> a504b16ad ACCUMULO-2332 More whitespace altercations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.a

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d42417d Tree: http://

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d58bbd3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d58bbd3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d58bb

[2/6] git commit: ACCUMULO-2344 Whitespace altercation

ACCUMULO-2344 Whitespace altercation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6730880d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6730880d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f375130 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f375130 Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] git commit: ACCUMULO-2344 Whitespace altercation

Updated Branches: refs/heads/1.5.1-SNAPSHOT bfa20dd07 -> 6730880db refs/heads/1.6.0-SNAPSHOT d60a38c08 -> 1f3751309 refs/heads/master 66230c939 -> 2d58bbd37 ACCUMULO-2344 Whitespace altercation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.

[3/6] git commit: ACCUMULO-2344 Whitespace altercation

ACCUMULO-2344 Whitespace altercation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6730880d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6730880d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f375130 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f375130 Diff: http://git-wip-us.apache.org/repos/asf/

[1/6] git commit: ACCUMULO-2329 Infer the GC role from master when gc file is not present.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 30799163e -> bfa20dd07 refs/heads/1.6.0-SNAPSHOT 5a58538e4 -> d60a38c08 refs/heads/master 00db80b65 -> 66230c939 ACCUMULO-2329 Infer the GC role from master when gc file is not present. Project: http://git-wip-us.apache.org/repos/asf/accumulo/re

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[2/6] git commit: ACCUMULO-2329 Infer the GC role from master when gc file is not present.

ACCUMULO-2329 Infer the GC role from master when gc file is not present. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfa20dd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfa20dd0 Diff: http://git-wip-u

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/66230c93 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/66230c93 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/66230c

[3/6] git commit: ACCUMULO-2329 Infer the GC role from master when gc file is not present.

ACCUMULO-2329 Infer the GC role from master when gc file is not present. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bfa20dd0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bfa20dd0 Diff: http://git-wip-u

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a58538e Tree: http://

[1/6] git commit: ACCUMULO-2332 Rework how address parsing is currently done by the GC.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 78ba31d5a -> 30799163e refs/heads/1.6.0-SNAPSHOT b4b0c0ee6 -> 5a58538e4 refs/heads/master 2ed6fb83c -> 00db80b65 ACCUMULO-2332 Rework how address parsing is currently done by the GC. Try to reduce the number of creations of an InetSocketAddress a

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00db80b6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00db80b6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00db80

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a58538e Tree: http://

[2/6] git commit: ACCUMULO-2332 Rework how address parsing is currently done by the GC.

ACCUMULO-2332 Rework how address parsing is currently done by the GC. Try to reduce the number of creations of an InetSocketAddress and ensure that an externally addressable hostname/address is placed in zookeeper. Also, replace 0.0.0.0 with the hostname for the machine when provided as the addres

[3/6] git commit: ACCUMULO-2332 Rework how address parsing is currently done by the GC.

ACCUMULO-2332 Rework how address parsing is currently done by the GC. Try to reduce the number of creations of an InetSocketAddress and ensure that an externally addressable hostname/address is placed in zookeeper. Also, replace 0.0.0.0 with the hostname for the machine when provided as the addres

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

[1/6] git commit: ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException.

Updated Branches: refs/heads/1.5.1-SNAPSHOT 4cb92ca61 -> 78ba31d5a refs/heads/1.6.0-SNAPSHOT d8fd73e2a -> b4b0c0ee6 refs/heads/master 751803663 -> 2ed6fb83c ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException. Project: http://git-wip-us.apache.org/repos/asf/

[2/6] git commit: ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException.

ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78ba31d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78ba31d5 Diff: http:

[3/6] git commit: ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException.

ACCUMULO-2344 interrupt the current thread when we catch the InterruptedException. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78ba31d5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78ba31d5 Diff: http:

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

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

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

Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2ed6fb83 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ed6fb83 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ed6fb