Merge branch '1.6' for ACCUMULO-1722
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/692312b5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/692312b5 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/692312b5 Branch: refs/heads/metrics2 Commit: 692312b57b6334021235d72d48f71da905489390 Parents: 191bee1 eed1656 Author: Dave Marion <[email protected]> Authored: Mon Dec 1 19:05:40 2014 -0500 Committer: Dave Marion <[email protected]> Committed: Mon Dec 1 19:05:40 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/Admin.java | 155 +++++++++++++------ .../accumulo/server/util/AdminCommandsTest.java | 3 +- .../org/apache/accumulo/test/DumpConfigIT.java | 9 +- 3 files changed, 115 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/692312b5/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java ---------------------------------------------------------------------- diff --cc server/base/src/main/java/org/apache/accumulo/server/util/Admin.java index 651d31d,6c1128e..ae36f1f --- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java @@@ -34,24 -35,27 +35,27 @@@ import org.apache.accumulo.core.client. import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.Instance; + import org.apache.accumulo.core.client.NamespaceNotFoundException; import org.apache.accumulo.core.client.TableNotFoundException; import org.apache.accumulo.core.client.admin.InstanceOperations; +import org.apache.accumulo.core.client.impl.ClientContext; import org.apache.accumulo.core.client.impl.ClientExec; import org.apache.accumulo.core.client.impl.MasterClient; -import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; import org.apache.accumulo.core.conf.DefaultConfiguration; import org.apache.accumulo.core.conf.Property; import org.apache.accumulo.core.master.thrift.MasterClientService; import org.apache.accumulo.core.metadata.MetadataTable; + import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.Credentials; + import org.apache.accumulo.core.security.NamespacePermission; import org.apache.accumulo.core.security.SystemPermission; import org.apache.accumulo.core.security.TablePermission; +import org.apache.accumulo.core.trace.Tracer; import org.apache.accumulo.core.util.AddressUtil; +import org.apache.accumulo.server.AccumuloServerContext; import org.apache.accumulo.server.cli.ClientOpts; -import org.apache.accumulo.server.conf.ServerConfiguration; -import org.apache.accumulo.server.security.SystemCredentials; -import org.apache.accumulo.trace.instrument.Tracer; +import org.apache.accumulo.server.conf.ServerConfigurationFactory; import org.apache.hadoop.conf.Configuration; import org.apache.log4j.Logger;
