[3/4] git commit: ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent.

ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/290866f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/290866f2 Diff: http://git-wi

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab6871e1 Tree: http://git-wip-us.apache.o

[1/4] git commit: ACCUMULO-3006 add messages to {{IllegalArgumentException}}s

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 1b459a020 -> 290866f25 refs/heads/master 02dee23e1 -> ab6871e16 ACCUMULO-3006 add messages to {{IllegalArgumentException}}s Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/rep

[2/4] git commit: ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent.

ACCUMULO-3052 Use a StringUtils method that isn't hadoop version dependent. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/290866f2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/290866f2 Diff: http://git-wi

git commit: ACCUMULO-3006 add messages to {{IllegalArgumentException}}s

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT d34887a23 -> 1b459a020 ACCUMULO-3006 add messages to {{IllegalArgumentException}}s Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b459a02 Tree: http:

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

Repository: accumulo Updated Branches: refs/heads/master be7a43f62 -> 02dee23e1 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/a

[2/3] git commit: ACCUMULO-2704 print information about dead servers

ACCUMULO-2704 print information about dead servers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d34887a2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d34887a2 Diff: http://git-wip-us.apache.org/repos/asf

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

git commit: ACCUMULO-2704 print information about dead servers

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 61720c7a3 -> d34887a23 ACCUMULO-2704 print information about dead servers Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d34887a2 Tree: http://git-wip

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

[1/6] git commit: ACCUMULO-3009 ensure that there have been no important events between balance calls

Repository: accumulo Updated Branches: refs/heads/master c39079691 -> be7a43f62 ACCUMULO-3009 ensure that there have been no important events between balance calls Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/611

[5/6] git commit: ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap

ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c479e5f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c479e5f5 Diff: http://git-wip-us.apache.org

[4/6] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/faa3fc2b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/faa3fc2b Diff: http://git-wip-

[2/6] git commit: ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap

ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc1a4ff0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fc1a4ff0 Diff: http://git-wip-us.apache.org

[6/6] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/be7a43f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/be7a43f6 Diff: http://git-wip-

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

Merge branch '1.5.2-SNAPSHOT' 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/e856ea66 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e856ea66 Diff: http://git-wip-us.apache.org/repos/asf/

[3/3] 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/61720c7a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6

[1/3] git commit: ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT d5e094ddf -> 61720c7a3 ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc1a4ff0 Tree: http

git commit: ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap

Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 139bd83cf -> fc1a4ff07 ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fc1a4ff0 Tree: http

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: docs/src/main/asciidoc/chapters/administration.txt docs/src/main/asciidoc/chapters/clients.txt Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3907969 Tree: http

[1/3] git commit: ACCUMULO-3045 Update user manual for CredentialProviderToken.

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 4d70739ab -> d5e094ddf refs/heads/master d4400499e -> c39079691 ACCUMULO-3045 Update user manual for CredentialProviderToken. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/r

[2/3] git commit: ACCUMULO-3045 Update user manual for CredentialProviderToken.

ACCUMULO-3045 Update user manual for CredentialProviderToken. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d5e094dd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d5e094dd Diff: http://git-wip-us.apache.or

git commit: ACCUMULO-3053 Update user manual about enabling/disabling certain SSL ciphers for monitor

Repository: accumulo Updated Branches: refs/heads/master eeb06e3a1 -> d4400499e ACCUMULO-3053 Update user manual about enabling/disabling certain SSL ciphers for monitor Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/comm

[2/3] git commit: ACCUMULO-3053 Pull include/exclude ciphers for Monitor SSL

ACCUMULO-3053 Pull include/exclude ciphers for Monitor SSL Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4d70739a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d70739a Diff: http://git-wip-us.apache.org/r

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

Merge branch '1.6.1-SNAPSHOT' Conflicts: server/monitor/src/main/java/org/apache/accumulo/monitor/EmbeddedWebServer.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eeb06e3a Tree: http://git-wip-us.apache.o

[1/3] git commit: ACCUMULO-3053 Pull include/exclude ciphers for Monitor SSL

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 1b49f44d1 -> 4d70739ab refs/heads/master a458a2fae -> eeb06e3a1 ACCUMULO-3053 Pull include/exclude ciphers for Monitor SSL Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repo

[1/2] git commit: ACCUMULO-3051 give zookeeper updates time to propagate

Repository: accumulo Updated Branches: refs/heads/master 6ef85f9c5 -> a458a2fae ACCUMULO-3051 give zookeeper updates time to propagate Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a458a2fa Tree: http://git-wip-us.

[2/2] git commit: ACCUMULO-3025 check for a null pointer

ACCUMULO-3025 check for a null pointer Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b036443 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b036443 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/di

git commit: ACCUMULO-3010 include a test to ensure recovery doesn't do a merge

Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 20aecf7d6 -> 1b49f44d1 ACCUMULO-3010 include a test to ensure recovery doesn't do a merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b49f44d Tree

[2/2] 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/6ef85f9c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6ef85f9c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6ef85f

[1/2] git commit: ACCUMULO-3010 include a test to ensure recovery doesn't do a merge

Repository: accumulo Updated Branches: refs/heads/master 4bb28faaf -> 6ef85f9c5 ACCUMULO-3010 include a test to ensure recovery doesn't do a merge Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b49f44d Tree: http:/