[2/3] accumulo git commit: ACCUMULO-3532 Remove changes to ServerType.

ACCUMULO-3532 Remove changes to ServerType. ServerType is in public API and can't have additions to it per semver. Introduce a class not in the public API that lets us do what we want. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/ac

[1/3] accumulo git commit: ACCUMULO-3532 Remove changes to ServerType.

Repository: accumulo Updated Branches: refs/heads/1.6 69ca8c9c0 -> c1d9118ba refs/heads/master 8aada370d -> ec6a15e1f ACCUMULO-3532 Remove changes to ServerType. ServerType is in public API and can't have additions to it per semver. Introduce a class not in the public API that lets us do wha

[3/3] accumulo git commit: Merge branch '1.6'

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