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

Merge branch '1.6.1-SNAPSHOT' Conflicts: assemble/bin/start-server.sh assemble/bin/stop-server.sh Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91186bf2 Tree: http://git-wip-us.apache.org/repos/asf/acc

[2/9] git commit: ACCUMULO-3084 just warn about long timer delays

ACCUMULO-3084 just warn about long timer delays Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6f2fd4d3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6f2fd4d3 Diff: http://git-wip-us.apache.org/repos/asf/ac

[6/9] git commit: ACCUMULO-3087 Attempt to expand shortname to FQDN.

ACCUMULO-3087 Attempt to expand shortname to FQDN. This should make start-server.sh a bit more resilient against thinking it needs to SSH around. Instead of having to match exactly what `hostname` is returning, this should prevent an (unnecessary) SSH just because hostname is returning the short i

[7/9] 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/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8147b196 Tree: http://git-

[1/9] git commit: ACCUMULO-3084 just warn about long timer delays

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 6f2fd4d3a -> f838cd9e4 refs/heads/1.6.1-SNAPSHOT 8808ecbf1 -> 8147b196a refs/heads/master 572d473d3 -> 91186bf27 ACCUMULO-3084 just warn about long timer delays Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo C

[5/9] git commit: ACCUMULO-3087 Attempt to expand shortname to FQDN.

ACCUMULO-3087 Attempt to expand shortname to FQDN. This should make start-server.sh a bit more resilient against thinking it needs to SSH around. Instead of having to match exactly what `hostname` is returning, this should prevent an (unnecessary) SSH just because hostname is returning the short i

[4/9] git commit: ACCUMULO-3087 Attempt to expand shortname to FQDN.

ACCUMULO-3087 Attempt to expand shortname to FQDN. This should make start-server.sh a bit more resilient against thinking it needs to SSH around. Instead of having to match exactly what `hostname` is returning, this should prevent an (unnecessary) SSH just because hostname is returning the short i

[3/9] git commit: Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.1-SNAPSHOT

Merge branch '1.6.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/8808ecbf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8

[8/9] 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/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8147b196 Tree: http://git-