Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74AA010E0A for ; Tue, 7 Jan 2014 02:49:58 +0000 (UTC) Received: (qmail 75704 invoked by uid 500); 7 Jan 2014 02:49:58 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 75636 invoked by uid 500); 7 Jan 2014 02:49:58 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 75578 invoked by uid 99); 7 Jan 2014 02:49:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 02:49:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B1C4387F5; Tue, 7 Jan 2014 02:49:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Tue, 07 Jan 2014 02:49:59 -0000 Message-Id: <5ddc90c0fe214cf4b62cdfc240ed99e5@git.apache.org> In-Reply-To: <071c075067f4488fb3af4260bb6c52f1@git.apache.org> References: <071c075067f4488fb3af4260bb6c52f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98211f58 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98211f58 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98211f58 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 98211f5812c3900963953b38f231827af7ea6397 Parents: da9e0f4 21b1b11 Author: Christopher Tubbs Authored: Mon Jan 6 21:49:41 2014 -0500 Committer: Christopher Tubbs Committed: Mon Jan 6 21:49:41 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/98211f58/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java index 1497153,18d55a6..8b0546a --- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java +++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java @@@ -28,17 -28,20 +28,16 @@@ import org.apache.accumulo.core.client. import org.apache.accumulo.core.client.security.tokens.AuthenticationToken; import org.apache.accumulo.core.client.security.tokens.PasswordToken; import org.apache.accumulo.core.conf.AccumuloConfiguration; -import org.apache.accumulo.core.conf.Property; -import org.apache.accumulo.core.file.FileUtil; -import org.apache.accumulo.core.security.CredentialHelper; -import org.apache.accumulo.core.security.thrift.TCredentials; +import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.metadata.RootTable; +import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.util.ArgumentChecker; import org.apache.accumulo.core.util.ByteBufferUtil; -import org.apache.accumulo.core.util.CachedConfiguration; import org.apache.accumulo.core.util.OpTimer; import org.apache.accumulo.core.util.TextUtil; - import org.apache.accumulo.core.util.ThriftUtil; import org.apache.accumulo.core.zookeeper.ZooUtil; import org.apache.accumulo.fate.zookeeper.ZooCache; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; +import org.apache.commons.configuration.Configuration; import org.apache.hadoop.io.Text; import org.apache.log4j.Level; import org.apache.log4j.Logger;