[2/2] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6e85cfa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6e85cfa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6e85cfa Branch:

[1/2] accumulo git commit: ACCUMULO-3883 remove ClientConfiguration.loadDefault from TransportCachingIT

Repository: accumulo Updated Branches: refs/heads/master 3d9336b83 -> e6e85cfa1 ACCUMULO-3883 remove ClientConfiguration.loadDefault from TransportCachingIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c475af0f Tr

accumulo git commit: ACCUMULO-3883 remove ClientConfiguration.loadDefault from TransportCachingIT

Repository: accumulo Updated Branches: refs/heads/1.7 92d19eeb7 -> c475af0f9 ACCUMULO-3883 remove ClientConfiguration.loadDefault from TransportCachingIT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c475af0f Tree:

[2/2] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d9336b8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d9336b8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d9336b8 Branch:

[1/2] accumulo git commit: ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration

Repository: accumulo Updated Branches: refs/heads/master 0b7d8eeae -> 3d9336b83 ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/

accumulo git commit: ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration

Repository: accumulo Updated Branches: refs/heads/1.7 5bd993bae -> 92d19eeb7 ACCUMULO-3883 fix how StandaloneAccumuloClusterConfiguration loads ClientConfiguration Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/92d

[1/7] accumulo git commit: ACCUMULO-3881 Fix *ProxyITs to work with Kerberos enabled.

Repository: accumulo Updated Branches: refs/heads/1.7 99c734c8c -> 5bd993bae refs/heads/master fba068b7b -> 0b7d8eeae ACCUMULO-3881 Fix *ProxyITs to work with Kerberos enabled. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accum

[5/7] accumulo git commit: Merge branch '1.7'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b7d8eea/test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java -- diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java index 5529d37,

[7/7] accumulo git commit: Merge branch '1.7'

Merge branch '1.7' Conflicts: test/src/test/java/org/apache/accumulo/test/proxy/TestProxyClient.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0b7d8eea Tree: http://git-wip-us.apache.org/repos/asf/accumulo

[3/7] accumulo git commit: ACCUMULO-3882 Use provided ClientConfiguration

ACCUMULO-3882 Use provided ClientConfiguration Avoids a locally installed clientconfiguration file from breaking the test. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bd993ba Tree: http://git-wip-us.apache.org/repo

[2/7] accumulo git commit: ACCUMULO-3881 Fix *ProxyITs to work with Kerberos enabled.

ACCUMULO-3881 Fix *ProxyITs to work with Kerberos enabled. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/198c5fb8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/198c5fb8 Diff: http://git-wip-us.apache.org/r

[4/7] accumulo git commit: ACCUMULO-3882 Use provided ClientConfiguration

ACCUMULO-3882 Use provided ClientConfiguration Avoids a locally installed clientconfiguration file from breaking the test. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5bd993ba Tree: http://git-wip-us.apache.org/repo

[6/7] accumulo git commit: Merge branch '1.7'

http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b7d8eea/test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java -- diff --cc test/src/test/java/org/apache/accumulo/test/proxy/SimpleProxyBase.java index 8344156,