[1/2] git commit: ACCUMULO-2062 marking property general.volume.chooser as @Experimental

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT b0a1f6d61 - 1a66f3bd8


ACCUMULO-2062 marking property general.volume.chooser as @Experimental


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a06b6c6e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a06b6c6e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a06b6c6e

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a06b6c6e44cbb28584e93ff88395e7fbaa637035
Parents: b0a1f6d
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 09:45:33 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 09:45:33 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a06b6c6e/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 63c720e..fb3e916 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -145,6 +145,7 @@ public enum Property {
   GENERAL_KERBEROS_PRINCIPAL(general.kerberos.principal, , 
PropertyType.STRING, Name of the kerberos principal to use. _HOST will 
automatically be 
   + replaced by the machines hostname in the hostname portion of the 
principal. Leave blank if not using kerberoized hdfs),
   GENERAL_MAX_MESSAGE_SIZE(general.server.message.size.max, 1G, 
PropertyType.MEMORY, The maximum size of a message that can be sent to a 
server.),
+  @Experimental
   GENERAL_VOLUME_CHOOSER(general.volume.chooser, 
org.apache.accumulo.server.fs.RandomVolumeChooser, PropertyType.CLASSNAME,
   The class that will be used to select which volume will be used to 
create new files.),
 

[2/2] git commit: ACCUMULO-2361 fix missing space in error message

[ecn]

ACCUMULO-2361 fix missing space in error message


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1a66f3bd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a66f3bd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a66f3bd

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1a66f3bd851cc171b26c6b9e62c515338207afac
Parents: a06b6c6
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 09:47:21 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 09:47:21 2014 -0500

--
 .../main/java/org/apache/accumulo/master/tableOps/DeleteTable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1a66f3bd/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index f30618e..6751346 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -102,7 +102,7 @@ class CleanUp extends MasterRepo {
 for (EntryKey,Value entry : scanner) {
   TabletLocationState locationState = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
   if (!locationState.extent.isPreviousExtent(prevExtent)) {
-log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency + prevExtent +   + locationState.extent);
+log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency  + prevExtent +   + locationState.extent);
 done = false;
 break;
   }

[2/5] git commit: Merge branch '1.6.0-SNAPSHOT'

[ecn]

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b7f1894
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b7f1894
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b7f1894

Branch: refs/heads/master
Commit: 9b7f1894e4b73e8541d6b633f86d516ccbae4772
Parents: 9754322 b0a1f6d
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Feb 14 13:07:19 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Feb 14 13:07:19 2014 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java | 1 -
 1 file changed, 1 deletion(-)
--

[1/5] git commit: ACCUMULO-2370 remove useless call

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 9754322d3 - 3043c2202


ACCUMULO-2370 remove useless call


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0a1f6d6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0a1f6d6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0a1f6d6

Branch: refs/heads/master
Commit: b0a1f6d61eedc8e78b2100f6c750ee7ec3fc3df3
Parents: b68ae97
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Feb 14 13:07:04 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Feb 14 13:07:04 2014 -0500

--
 .../org/apache/accumulo/test/functional/GarbageCollectorIT.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0a1f6d6/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 81377bc..cc62cbb 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -78,7 +78,6 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
 settings.put(Property.TSERV_MAXMEM.getKey(), 5K);
 settings.put(Property.TSERV_MAJC_DELAY.getKey(), 1);
 cfg.setSiteConfig(settings);
-cfg.useMiniDFS();
   }
 
   private void killMacGc() throws ProcessNotFoundException, 
InterruptedException, KeeperException {

[4/5] git commit: ACCUMULO-2361 fix missing space in error message

[ecn]

ACCUMULO-2361 fix missing space in error message


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1a66f3bd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1a66f3bd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1a66f3bd

Branch: refs/heads/master
Commit: 1a66f3bd851cc171b26c6b9e62c515338207afac
Parents: a06b6c6
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 09:47:21 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 09:47:21 2014 -0500

--
 .../main/java/org/apache/accumulo/master/tableOps/DeleteTable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1a66f3bd/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index f30618e..6751346 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@ -102,7 +102,7 @@ class CleanUp extends MasterRepo {
 for (EntryKey,Value entry : scanner) {
   TabletLocationState locationState = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
   if (!locationState.extent.isPreviousExtent(prevExtent)) {
-log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency + prevExtent +   + locationState.extent);
+log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency  + prevExtent +   + locationState.extent);
 done = false;
 break;
   }

[3/5] git commit: ACCUMULO-2062 marking property general.volume.chooser as @Experimental

[ecn]

ACCUMULO-2062 marking property general.volume.chooser as @Experimental


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a06b6c6e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a06b6c6e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a06b6c6e

Branch: refs/heads/master
Commit: a06b6c6e44cbb28584e93ff88395e7fbaa637035
Parents: b0a1f6d
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 09:45:33 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 09:45:33 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a06b6c6e/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 63c720e..fb3e916 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -145,6 +145,7 @@ public enum Property {
   GENERAL_KERBEROS_PRINCIPAL(general.kerberos.principal, , 
PropertyType.STRING, Name of the kerberos principal to use. _HOST will 
automatically be 
   + replaced by the machines hostname in the hostname portion of the 
principal. Leave blank if not using kerberoized hdfs),
   GENERAL_MAX_MESSAGE_SIZE(general.server.message.size.max, 1G, 
PropertyType.MEMORY, The maximum size of a message that can be sent to a 
server.),
+  @Experimental
   GENERAL_VOLUME_CHOOSER(general.volume.chooser, 
org.apache.accumulo.server.fs.RandomVolumeChooser, PropertyType.CLASSNAME,
   The class that will be used to select which volume will be used to 
create new files.),
 

[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'

[ecn]

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3043c220
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3043c220
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3043c220

Branch: refs/heads/master
Commit: 3043c22020cb7df4b959e637ba6d59eab0df9362
Parents: 9b7f189 1a66f3b
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 09:47:51 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 09:47:51 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 1 +
 .../main/java/org/apache/accumulo/master/tableOps/DeleteTable.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3043c220/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--

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

[ecn]

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d9e3e3c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d9e3e3c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d9e3e3c4

Branch: refs/heads/master
Commit: d9e3e3c4b941e2c023cd4443d4c2a18c9be96cf7
Parents: 3043c22 7908193
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:52:59 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:52:59 2014 -0500

--
 .../accumulo/master/tableOps/DeleteTable.java   |   2 +-
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 +++
 2 files changed, 127 insertions(+), 1 deletion(-)
--

[1/2] git commit: ACCUMULO-2361 IT to reproduce

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT a9cd5d14e - b0d580889


ACCUMULO-2361 IT to reproduce


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00ff4481
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00ff4481
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00ff4481

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 00ff44819bf97063ad04a96c924a2fde0a10bdd6
Parents: 5eb19c6
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:50:46 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:50:46 2014 -0500

--
 .../server/master/tableOps/DeleteTable.java |   2 +-
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 +++
 2 files changed, 127 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00ff4481/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
 
b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
index f13d3a9..60b5633 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
@@ -97,7 +97,7 @@ class CleanUp extends MasterRepo {
 for (EntryKey,Value entry : scanner) {
   TabletLocationState locationState = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
   if (!locationState.extent.isPreviousExtent(prevExtent)) {
-log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency + prevExtent +   + locationState.extent);
+log.info(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency  + prevExtent +   + locationState.extent);
 done = false;
 break;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/00ff4481/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
new file mode 100644
index 000..65b39a7
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.Future;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.fate.util.UtilWaitThread;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.hadoop.io.Text;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+// ACCUMULO-2361
+public class DeleteTableDuringSplitIT {
+  public static TemporaryFolder folder = new TemporaryFolder();
+  private MiniAccumuloCluster accumulo;
+  private String secret = secret;
+  
+  Connector getConnector() throws AccumuloException, AccumuloSecurityException 
{
+ZooKeeperInstance zki = new ZooKeeperInstance(accumulo.getInstanceName(), 
accumulo.getZooKeepers());
+return zki.getConnector(root, new PasswordToken(secret));
+  }
+  
+  String[] getTableNames(int n) {
+String[] result = new 

[1/3] git commit: ACCUMULO-2361 IT to reproduce

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 3043c2202 - d9e3e3c4b


ACCUMULO-2361 IT to reproduce


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/00ff4481
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/00ff4481
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/00ff4481

Branch: refs/heads/master
Commit: 00ff44819bf97063ad04a96c924a2fde0a10bdd6
Parents: 5eb19c6
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:50:46 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:50:46 2014 -0500

--
 .../server/master/tableOps/DeleteTable.java |   2 +-
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 +++
 2 files changed, 127 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00ff4481/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
 
b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
index f13d3a9..60b5633 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/master/tableOps/DeleteTable.java
@@ -97,7 +97,7 @@ class CleanUp extends MasterRepo {
 for (EntryKey,Value entry : scanner) {
   TabletLocationState locationState = 
MetaDataTableScanner.createTabletLocationState(entry.getKey(), 
entry.getValue());
   if (!locationState.extent.isPreviousExtent(prevExtent)) {
-log.debug(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency + prevExtent +   + locationState.extent);
+log.info(Still waiting for table to be deleted:  + tableId +  saw 
inconsistency  + prevExtent +   + locationState.extent);
 done = false;
 break;
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/00ff4481/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
new file mode 100644
index 000..65b39a7
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.Future;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.fate.util.UtilWaitThread;
+import org.apache.accumulo.minicluster.MiniAccumuloCluster;
+import org.apache.hadoop.io.Text;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+// ACCUMULO-2361
+public class DeleteTableDuringSplitIT {
+  public static TemporaryFolder folder = new TemporaryFolder();
+  private MiniAccumuloCluster accumulo;
+  private String secret = secret;
+  
+  Connector getConnector() throws AccumuloException, AccumuloSecurityException 
{
+ZooKeeperInstance zki = new ZooKeeperInstance(accumulo.getInstanceName(), 
accumulo.getZooKeepers());
+return zki.getConnector(root, new PasswordToken(secret));
+  }
+  
+  String[] getTableNames(int n) {
+String[] result = new String[n];
+for 

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:

server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7908193f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7908193f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7908193f

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7908193fbefa4e233639b4bc28142a378dff50af
Parents: 1a66f3b 00ff448
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:52:46 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:52:46 2014 -0500

--
 .../accumulo/master/tableOps/DeleteTable.java   |   2 +-
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 +++
 2 files changed, 127 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7908193f/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
--
diff --cc 
server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
index 6751346,000..d264f14
mode 100644,00..100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
@@@ -1,259 -1,0 +1,259 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the License); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.master.tableOps;
 +
 +import java.io.IOException;
 +import java.util.Arrays;
 +import java.net.UnknownHostException;
 +import java.util.Map.Entry;
 +
 +import org.apache.accumulo.core.client.BatchScanner;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.impl.Tables;
 +import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 +import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.data.Value;
 +import org.apache.accumulo.core.iterators.user.GrepIterator;
 +import org.apache.accumulo.core.master.state.tables.TableState;
 +import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.schema.MetadataSchema;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.fate.Repo;
 +import org.apache.accumulo.master.Master;
 +import org.apache.accumulo.server.ServerConstants;
 +import org.apache.accumulo.server.client.HdfsZooInstance;
 +import org.apache.accumulo.server.fs.VolumeManager;
 +import org.apache.accumulo.server.master.state.MetaDataTableScanner;
 +import org.apache.accumulo.server.master.state.TabletLocationState;
 +import org.apache.accumulo.server.master.state.TabletState;
 +import org.apache.accumulo.server.problems.ProblemReports;
 +import org.apache.accumulo.server.security.AuditedSecurityOperation;
 +import org.apache.accumulo.server.security.SystemCredentials;
 +import org.apache.accumulo.server.tables.TableManager;
 +import org.apache.accumulo.server.util.MetadataTableUtil;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.io.Text;
 +import org.apache.log4j.Logger;
 +
 +class CleanUp extends MasterRepo {
 +  
 +  final private static Logger log = Logger.getLogger(CleanUp.class);
 +  
 +  private static final long serialVersionUID = 1L;
 +  
 +  private String tableId, namespaceId;
 +  
 +  private long creationTime;
 +  
 +  private void readObject(java.io.ObjectInputStream in) throws IOException, 
ClassNotFoundException {
 +in.defaultReadObject();
 +
 +/*
 + * handle the case where we 

git commit: ACCUMULO-2361 made test a functional SimpleIT for 1.6 and later

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master d9e3e3c4b - ad9f9c13d


ACCUMULO-2361 made test a functional SimpleIT for 1.6 and later


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ad9f9c13
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad9f9c13
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ad9f9c13

Branch: refs/heads/master
Commit: ad9f9c13dce4c9bc635c4645a5bafd04131a33cd
Parents: d9e3e3c
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:56:57 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:56:57 2014 -0500

--
 .../functional/DeleteTableDuringSplitIT.java| 100 +++
 1 file changed, 100 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ad9f9c13/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
 
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
new file mode 100644
index 000..79cb188
--- /dev/null
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.test.functional;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.concurrent.Future;
+
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.util.SimpleThreadPool;
+import org.apache.accumulo.fate.util.UtilWaitThread;
+import org.apache.hadoop.io.Text;
+import org.junit.Test;
+
+// ACCUMULO-2361
+public class DeleteTableDuringSplitIT extends SimpleMacIT {
+  
+  @Test(timeout= 10 * 60 * 1000)
+  public void test() throws Exception {
+String[] tableNames = getTableNames(50);
+// make a bunch of tables
+for (String tableName : tableNames) {
+  getConnector().tableOperations().create(tableName);
+}
+final SortedSetText splits = new TreeSetText();
+for (byte i = 0; i  100; i++) {
+  splits.add(new Text(new byte[] {0, 0, i}));
+}
+
+ListFuture? results = new ArrayListFuture?();
+SimpleThreadPool es = new SimpleThreadPool(tableNames.length, 
concurrent-api-requests);
+for (String tableName : tableNames) {
+  final String finalName = tableName;
+  results.add(es.submit(new Runnable() {
+@Override
+public void run() {
+  try {
+getConnector().tableOperations().addSplits(finalName, splits);
+  } catch (TableNotFoundException ex) {
+  } catch (Exception ex) {
+throw new RuntimeException(finalName, ex);
+  }
+}
+  }));
+  results.add(es.submit(new Runnable() {
+@Override
+public void run() {
+  try {
+UtilWaitThread.sleep(500);
+getConnector().tableOperations().delete(finalName);
+  } catch (Exception ex) {
+throw new RuntimeException(ex);
+  }
+}
+  }));
+}
+for (Future? f : results) {
+  f.get();
+}
+//results.clear();
+//for (String tableName : tableNames) {
+//  final String finalName = tableName;
+//  results.add(es.submit(new Runnable() {
+//@Override
+//public void run() {
+//  try {
+//getConnector().tableOperations().delete(finalName);
+//  } catch (Exception ex) {
+//throw new RuntimeException(ex);
+//  }
+//}
+//  }));
+//}
+//for (Future? f : results) {
+//  f.get();
+//}
+for (String tableName : tableNames) {
+  assertFalse(getConnector().tableOperations().exists(tableName));
+}
+  }
+
+}

git commit: ACCUMULO-2361 clean-up: remove commented code

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT b0d580889 - e0b8fb0e9


ACCUMULO-2361 clean-up: remove commented code


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0b8fb0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0b8fb0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0b8fb0e

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: e0b8fb0e98c1b38c4fa2e20ae0611e33e07ecba6
Parents: b0d5808
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:08:42 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:08:42 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0b8fb0e/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 65b39a7..77e417f 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -112,7 +112,6 @@ public class DeleteTableDuringSplitIT {
 }
   });
 }
-//Collections.shuffle(tasks);
 for (Runnable r : tasks)
   results.add(es.submit(r));
 for (Future? f : results) {

[2/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c91e349
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c91e349
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c91e349

Branch: refs/heads/master
Commit: 6c91e3491ce87cfe06c36d10fab402a6d96cb926
Parents: 7908193 b0d5808
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:09:29 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:09:29 2014 -0500

--
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 ---
 .../functional/DeleteTableDuringSplitIT.java|  86 +
 2 files changed, 86 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c91e349/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --cc 
test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 65b39a7,65b39a7..000
deleted file mode 100644,100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ /dev/null
@@@ -1,126 -1,126 +1,0 @@@
--/*
-- * Licensed to the Apache Software Foundation (ASF) under one or more
-- * contributor license agreements.  See the NOTICE file distributed with
-- * this work for additional information regarding copyright ownership.
-- * The ASF licenses this file to You under the Apache License, Version 2.0
-- * (the License); you may not use this file except in compliance with
-- * the License.  You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an AS IS BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--package org.apache.accumulo.test;
--
--import static org.junit.Assert.assertFalse;
--
--import java.util.ArrayList;
--import java.util.List;
--import java.util.SortedSet;
--import java.util.TreeSet;
--import java.util.concurrent.Future;
--
--import org.apache.accumulo.core.client.AccumuloException;
--import org.apache.accumulo.core.client.AccumuloSecurityException;
--import org.apache.accumulo.core.client.Connector;
--import org.apache.accumulo.core.client.TableNotFoundException;
--import org.apache.accumulo.core.client.ZooKeeperInstance;
--import org.apache.accumulo.core.client.security.tokens.PasswordToken;
--import org.apache.accumulo.core.util.SimpleThreadPool;
--import org.apache.accumulo.fate.util.UtilWaitThread;
--import org.apache.accumulo.minicluster.MiniAccumuloCluster;
--import org.apache.hadoop.io.Text;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.rules.TemporaryFolder;
--
--// ACCUMULO-2361
--public class DeleteTableDuringSplitIT {
--  public static TemporaryFolder folder = new TemporaryFolder();
--  private MiniAccumuloCluster accumulo;
--  private String secret = secret;
--  
--  Connector getConnector() throws AccumuloException, 
AccumuloSecurityException {
--ZooKeeperInstance zki = new ZooKeeperInstance(accumulo.getInstanceName(), 
accumulo.getZooKeepers());
--return zki.getConnector(root, new PasswordToken(secret));
--  }
--  
--  String[] getTableNames(int n) {
--String[] result = new String[n];
--for (int i = 0; i  n; i++) {
--  result[i] = test_ + i;
--}
--return result;
--  }
--  
--  @Before
--  public void setUp() throws Exception {
--folder.create();
--accumulo = new MiniAccumuloCluster(folder.getRoot(), secret);
--accumulo.start();
--  }
--  
--  @After
--  public void tearDown() throws Exception {
--accumulo.stop();
--//folder.delete();
--  }
--  
--
--  @Test(timeout= 10 * 60 * 1000)
--  public void test() throws Exception {
--String[] tableNames = getTableNames(100);
--// make a bunch of tables
--for (String tableName : tableNames) {
--  getConnector().tableOperations().create(tableName);
--}
--final SortedSetText splits = new TreeSetText();
--for (byte i = 0; i  100; i++) {
--  splits.add(new Text(new byte[]{0, 0, i}));
--}
--
--ListFuture? results = new ArrayListFuture?();
--ListRunnable tasks = new ArrayListRunnable();
--SimpleThreadPool es = new SimpleThreadPool(tableNames.length, 
concurrent-api-requests);
--for (String tableName : tableNames) {
--  final String finalName = tableName;
--  tasks.add(new Runnable() {
--@Override
--public void run() {
--  try {
--

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6c91e349
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6c91e349
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6c91e349

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6c91e3491ce87cfe06c36d10fab402a6d96cb926
Parents: 7908193 b0d5808
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:09:29 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:09:29 2014 -0500

--
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 ---
 .../functional/DeleteTableDuringSplitIT.java|  86 +
 2 files changed, 86 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6c91e349/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --cc 
test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 65b39a7,65b39a7..000
deleted file mode 100644,100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ /dev/null
@@@ -1,126 -1,126 +1,0 @@@
--/*
-- * Licensed to the Apache Software Foundation (ASF) under one or more
-- * contributor license agreements.  See the NOTICE file distributed with
-- * this work for additional information regarding copyright ownership.
-- * The ASF licenses this file to You under the Apache License, Version 2.0
-- * (the License); you may not use this file except in compliance with
-- * the License.  You may obtain a copy of the License at
-- *
-- * http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an AS IS BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--package org.apache.accumulo.test;
--
--import static org.junit.Assert.assertFalse;
--
--import java.util.ArrayList;
--import java.util.List;
--import java.util.SortedSet;
--import java.util.TreeSet;
--import java.util.concurrent.Future;
--
--import org.apache.accumulo.core.client.AccumuloException;
--import org.apache.accumulo.core.client.AccumuloSecurityException;
--import org.apache.accumulo.core.client.Connector;
--import org.apache.accumulo.core.client.TableNotFoundException;
--import org.apache.accumulo.core.client.ZooKeeperInstance;
--import org.apache.accumulo.core.client.security.tokens.PasswordToken;
--import org.apache.accumulo.core.util.SimpleThreadPool;
--import org.apache.accumulo.fate.util.UtilWaitThread;
--import org.apache.accumulo.minicluster.MiniAccumuloCluster;
--import org.apache.hadoop.io.Text;
--import org.junit.After;
--import org.junit.Before;
--import org.junit.Test;
--import org.junit.rules.TemporaryFolder;
--
--// ACCUMULO-2361
--public class DeleteTableDuringSplitIT {
--  public static TemporaryFolder folder = new TemporaryFolder();
--  private MiniAccumuloCluster accumulo;
--  private String secret = secret;
--  
--  Connector getConnector() throws AccumuloException, 
AccumuloSecurityException {
--ZooKeeperInstance zki = new ZooKeeperInstance(accumulo.getInstanceName(), 
accumulo.getZooKeepers());
--return zki.getConnector(root, new PasswordToken(secret));
--  }
--  
--  String[] getTableNames(int n) {
--String[] result = new String[n];
--for (int i = 0; i  n; i++) {
--  result[i] = test_ + i;
--}
--return result;
--  }
--  
--  @Before
--  public void setUp() throws Exception {
--folder.create();
--accumulo = new MiniAccumuloCluster(folder.getRoot(), secret);
--accumulo.start();
--  }
--  
--  @After
--  public void tearDown() throws Exception {
--accumulo.stop();
--//folder.delete();
--  }
--  
--
--  @Test(timeout= 10 * 60 * 1000)
--  public void test() throws Exception {
--String[] tableNames = getTableNames(100);
--// make a bunch of tables
--for (String tableName : tableNames) {
--  getConnector().tableOperations().create(tableName);
--}
--final SortedSetText splits = new TreeSetText();
--for (byte i = 0; i  100; i++) {
--  splits.add(new Text(new byte[]{0, 0, i}));
--}
--
--ListFuture? results = new ArrayListFuture?();
--ListRunnable tasks = new ArrayListRunnable();
--SimpleThreadPool es = new SimpleThreadPool(tableNames.length, 
concurrent-api-requests);
--for (String tableName : tableNames) {
--  final String finalName = tableName;
--  tasks.add(new Runnable() {
--@Override
--public void run() {
--  try {
--

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

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 7908193fb - 6c91e3491


Merge branch '1.5.1-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0d58088
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0d58088
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0d58088

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b0d5808892c92b15009791c9f8d03678415af32d
Parents: 00ff448 a9cd5d1
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:53:16 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:53:16 2014 -0500

--
 CHANGES | 807 ---
 bin/config.sh   |   9 +
 .../1GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/1GB/standalone/accumulo-env.sh|   1 -
 .../2GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/2GB/standalone/accumulo-env.sh|   1 -
 .../3GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/3GB/standalone/accumulo-env.sh|   1 -
 .../512MB/native-standalone/accumulo-env.sh |   1 -
 conf/examples/512MB/standalone/accumulo-env.sh  |   1 -
 .../org/apache/accumulo/core/Constants.java |   4 +-
 .../impl/TabletServerBatchReaderIterator.java   |  11 +-
 .../org/apache/accumulo/core/conf/Property.java |   1 +
 .../core/iterators/user/WholeRowIterator.java   |  55 +-
 .../apache/accumulo/core/util/AddressUtil.java  |   4 +
 .../iterators/user/WholeRowIteratorTest.java|  24 +-
 pom.xml |   2 +-
 .../org/apache/accumulo/proxy/SimpleTest.java   |  13 +-
 .../org/apache/accumulo/server/Accumulo.java|  76 +-
 .../server/conf/TableConfiguration.java |  14 +-
 .../server/gc/SimpleGarbageCollector.java   |  31 +-
 .../apache/accumulo/server/master/Master.java   |   5 +
 .../accumulo/server/monitor/LogService.java |  81 +-
 .../apache/accumulo/server/monitor/Monitor.java | 333 +---
 .../org/apache/accumulo/server/util/Info.java   |   2 +-
 .../apache/accumulo/server/util/Initialize.java |   2 +
 .../accumulo/server/util/TServerUtils.java  |   1 +
 .../server/watcher/MonitorLog4jWatcher.java | 154 
 .../AccumuloReloadingVFSClassLoaderTest.java|   9 +-
 .../providers/ReadOnlyHdfsFileProviderTest.java |   2 +-
 .../vfs/providers/VfsClassLoaderTest.java   |  11 +-
 .../apache/accumulo/test/AccumuloDFSBase.java   |  26 +-
 .../org/apache/accumulo/test/MetaSplitTest.java |   2 +-
 .../apache/accumulo/test/ShellServerTest.java   | 451 +++
 34 files changed, 1025 insertions(+), 1113 deletions(-)
--

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

[ecn]

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3e190398
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3e190398
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3e190398

Branch: refs/heads/master
Commit: 3e190398aa6fbcdbed1d6881468ab48adcd43fda
Parents: ad9f9c1 6c91e34
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:09:48 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:09:48 2014 -0500

--
 .../accumulo/test/DeleteTableDuringSplitIT.java | 126 ---
 .../functional/DeleteTableDuringSplitIT.java|  86 +
 2 files changed, 86 insertions(+), 126 deletions(-)
--

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

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master ad9f9c13d - 3e190398a


Merge branch '1.5.1-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b0d58088
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b0d58088
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b0d58088

Branch: refs/heads/master
Commit: b0d5808892c92b15009791c9f8d03678415af32d
Parents: 00ff448 a9cd5d1
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 11:53:16 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 11:53:16 2014 -0500

--
 CHANGES | 807 ---
 bin/config.sh   |   9 +
 .../1GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/1GB/standalone/accumulo-env.sh|   1 -
 .../2GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/2GB/standalone/accumulo-env.sh|   1 -
 .../3GB/native-standalone/accumulo-env.sh   |   1 -
 conf/examples/3GB/standalone/accumulo-env.sh|   1 -
 .../512MB/native-standalone/accumulo-env.sh |   1 -
 conf/examples/512MB/standalone/accumulo-env.sh  |   1 -
 .../org/apache/accumulo/core/Constants.java |   4 +-
 .../impl/TabletServerBatchReaderIterator.java   |  11 +-
 .../org/apache/accumulo/core/conf/Property.java |   1 +
 .../core/iterators/user/WholeRowIterator.java   |  55 +-
 .../apache/accumulo/core/util/AddressUtil.java  |   4 +
 .../iterators/user/WholeRowIteratorTest.java|  24 +-
 pom.xml |   2 +-
 .../org/apache/accumulo/proxy/SimpleTest.java   |  13 +-
 .../org/apache/accumulo/server/Accumulo.java|  76 +-
 .../server/conf/TableConfiguration.java |  14 +-
 .../server/gc/SimpleGarbageCollector.java   |  31 +-
 .../apache/accumulo/server/master/Master.java   |   5 +
 .../accumulo/server/monitor/LogService.java |  81 +-
 .../apache/accumulo/server/monitor/Monitor.java | 333 +---
 .../org/apache/accumulo/server/util/Info.java   |   2 +-
 .../apache/accumulo/server/util/Initialize.java |   2 +
 .../accumulo/server/util/TServerUtils.java  |   1 +
 .../server/watcher/MonitorLog4jWatcher.java | 154 
 .../AccumuloReloadingVFSClassLoaderTest.java|   9 +-
 .../providers/ReadOnlyHdfsFileProviderTest.java |   2 +-
 .../vfs/providers/VfsClassLoaderTest.java   |  11 +-
 .../apache/accumulo/test/AccumuloDFSBase.java   |  26 +-
 .../org/apache/accumulo/test/MetaSplitTest.java |   2 +-
 .../apache/accumulo/test/ShellServerTest.java   | 451 +++
 34 files changed, 1025 insertions(+), 1113 deletions(-)
--

git commit: ACCUMULO-2361 integration test should be int src/test/java

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 3e190398a - 491346ac1


ACCUMULO-2361 integration test should be int src/test/java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/491346ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/491346ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/491346ac

Branch: refs/heads/master
Commit: 491346ac1bc3795f3610d5c16fc209d1421b5a48
Parents: 3e19039
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:01:51 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:01:51 2014 -0500

--
 .../functional/DeleteTableDuringSplitIT.java| 100 ---
 1 file changed, 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/491346ac/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
 
b/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
deleted file mode 100644
index 79cb188..000
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the License); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.accumulo.test.functional;
-
-import static org.junit.Assert.assertFalse;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.concurrent.Future;
-
-import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.util.SimpleThreadPool;
-import org.apache.accumulo.fate.util.UtilWaitThread;
-import org.apache.hadoop.io.Text;
-import org.junit.Test;
-
-// ACCUMULO-2361
-public class DeleteTableDuringSplitIT extends SimpleMacIT {
-  
-  @Test(timeout= 10 * 60 * 1000)
-  public void test() throws Exception {
-String[] tableNames = getTableNames(50);
-// make a bunch of tables
-for (String tableName : tableNames) {
-  getConnector().tableOperations().create(tableName);
-}
-final SortedSetText splits = new TreeSetText();
-for (byte i = 0; i  100; i++) {
-  splits.add(new Text(new byte[] {0, 0, i}));
-}
-
-ListFuture? results = new ArrayListFuture?();
-SimpleThreadPool es = new SimpleThreadPool(tableNames.length, 
concurrent-api-requests);
-for (String tableName : tableNames) {
-  final String finalName = tableName;
-  results.add(es.submit(new Runnable() {
-@Override
-public void run() {
-  try {
-getConnector().tableOperations().addSplits(finalName, splits);
-  } catch (TableNotFoundException ex) {
-  } catch (Exception ex) {
-throw new RuntimeException(finalName, ex);
-  }
-}
-  }));
-  results.add(es.submit(new Runnable() {
-@Override
-public void run() {
-  try {
-UtilWaitThread.sleep(500);
-getConnector().tableOperations().delete(finalName);
-  } catch (Exception ex) {
-throw new RuntimeException(ex);
-  }
-}
-  }));
-}
-for (Future? f : results) {
-  f.get();
-}
-//results.clear();
-//for (String tableName : tableNames) {
-//  final String finalName = tableName;
-//  results.add(es.submit(new Runnable() {
-//@Override
-//public void run() {
-//  try {
-//getConnector().tableOperations().delete(finalName);
-//  } catch (Exception ex) {
-//throw new RuntimeException(ex);
-//  }
-//}
-//  }));
-//}
-//for (Future? f : results) {
-//  f.get();
-//}
-for (String tableName : tableNames) {
-  assertFalse(getConnector().tableOperations().exists(tableName));
-}
-  }
-
-}

git commit: ACCUMULO-2361 clean-up at the end of the test

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT e0b8fb0e9 - 8ca088e6a


ACCUMULO-2361 clean-up at the end of the test


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ca088e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ca088e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ca088e6

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 8ca088e6a37aa57181aaff63b749a7e7c5deb203
Parents: e0b8fb0
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:06:19 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:06:19 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ca088e6/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 77e417f..a6d4e9c 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -68,7 +68,7 @@ public class DeleteTableDuringSplitIT {
   @After
   public void tearDown() throws Exception {
 accumulo.stop();
-//folder.delete();
+folder.delete();
   }
   
 

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

[ecn]

Merge branch '1.6.0-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Conflicts:

test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91eb87c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91eb87c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91eb87c4

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 91eb87c4891f7b04cb8777a171a4d9654463f1ee
Parents: dd7e593 6c91e34
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:07:56 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:07:56 2014 -0500

--
 .../accumulo/test/DeleteTableDuringSplitIT.java | 125 ---
 .../functional/DeleteTableDuringSplitIT.java|  86 +
 2 files changed, 86 insertions(+), 125 deletions(-)
--

[3/4] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd7e5932
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd7e5932
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd7e5932

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: dd7e59322d9737cda417036b8eaa6dbeb4624400
Parents: 7908193 8ca088e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:06:35 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:06:35 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--

[1/4] git commit: ACCUMULO-2361 clean-up: remove commented code

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 6c91e3491 - 91eb87c48


ACCUMULO-2361 clean-up: remove commented code


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0b8fb0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0b8fb0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0b8fb0e

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e0b8fb0e98c1b38c4fa2e20ae0611e33e07ecba6
Parents: b0d5808
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:08:42 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:08:42 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0b8fb0e/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 65b39a7..77e417f 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -112,7 +112,6 @@ public class DeleteTableDuringSplitIT {
 }
   });
 }
-//Collections.shuffle(tasks);
 for (Runnable r : tasks)
   results.add(es.submit(r));
 for (Future? f : results) {

[2/4] git commit: ACCUMULO-2361 clean-up at the end of the test

[ecn]

ACCUMULO-2361 clean-up at the end of the test


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ca088e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ca088e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ca088e6

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 8ca088e6a37aa57181aaff63b749a7e7c5deb203
Parents: e0b8fb0
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:06:19 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:06:19 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ca088e6/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 77e417f..a6d4e9c 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -68,7 +68,7 @@ public class DeleteTableDuringSplitIT {
   @After
   public void tearDown() throws Exception {
 accumulo.stop();
-//folder.delete();
+folder.delete();
   }
   
 

[3/5] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dd7e5932
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dd7e5932
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dd7e5932

Branch: refs/heads/master
Commit: dd7e59322d9737cda417036b8eaa6dbeb4624400
Parents: 7908193 8ca088e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:06:35 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:06:35 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--

[1/5] git commit: ACCUMULO-2361 clean-up: remove commented code

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 491346ac1 - 9a2ac766f


ACCUMULO-2361 clean-up: remove commented code


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e0b8fb0e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e0b8fb0e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e0b8fb0e

Branch: refs/heads/master
Commit: e0b8fb0e98c1b38c4fa2e20ae0611e33e07ecba6
Parents: b0d5808
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 12:08:42 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 12:08:42 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e0b8fb0e/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 65b39a7..77e417f 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -112,7 +112,6 @@ public class DeleteTableDuringSplitIT {
 }
   });
 }
-//Collections.shuffle(tasks);
 for (Runnable r : tasks)
   results.add(es.submit(r));
 for (Future? f : results) {

[5/5] git commit: Merge branch '1.6.0-SNAPSHOT'

[ecn]

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9a2ac766
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a2ac766
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9a2ac766

Branch: refs/heads/master
Commit: 9a2ac766ff6941086df145a31fd3d9285ed6159c
Parents: 491346a 91eb87c
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:08:15 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:08:15 2014 -0500

--

--

[4/5] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

[ecn]

Merge branch '1.6.0-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Conflicts:

test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91eb87c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91eb87c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91eb87c4

Branch: refs/heads/master
Commit: 91eb87c4891f7b04cb8777a171a4d9654463f1ee
Parents: dd7e593 6c91e34
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:07:56 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:07:56 2014 -0500

--
 .../accumulo/test/DeleteTableDuringSplitIT.java | 125 ---
 .../functional/DeleteTableDuringSplitIT.java|  86 +
 2 files changed, 86 insertions(+), 125 deletions(-)
--

[2/5] git commit: ACCUMULO-2361 clean-up at the end of the test

[ecn]

ACCUMULO-2361 clean-up at the end of the test


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ca088e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ca088e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ca088e6

Branch: refs/heads/master
Commit: 8ca088e6a37aa57181aaff63b749a7e7c5deb203
Parents: e0b8fb0
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:06:19 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:06:19 2014 -0500

--
 .../java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8ca088e6/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java 
b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
index 77e417f..a6d4e9c 100644
--- a/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/DeleteTableDuringSplitIT.java
@@ -68,7 +68,7 @@ public class DeleteTableDuringSplitIT {
   @After
   public void tearDown() throws Exception {
 accumulo.stop();
-//folder.delete();
+folder.delete();
   }
   
 

svn commit: r898428 - in /websites/staging/accumulo/trunk/content: ./ notable_features.html

[buildbot]

Author: buildbot
Date: Tue Feb 18 20:10:40 2014
New Revision: 898428

Log:
Staging update by buildbot for accumulo

Modified:
websites/staging/accumulo/trunk/content/   (props changed)
websites/staging/accumulo/trunk/content/notable_features.html

Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Tue Feb 18 20:10:40 2014
@@ -1 +1 @@
-1568360
+1569514

Modified: websites/staging/accumulo/trunk/content/notable_features.html
==
--- websites/staging/accumulo/trunk/content/notable_features.html (original)
+++ websites/staging/accumulo/trunk/content/notable_features.html Tue Feb 18 
20:10:40 2014
@@ -130,7 +130,7 @@ documents containing certain words./p
 pMultiple masters can be configured.  Zookeeper locks are used to determine
 which master is active.  The remaining masters simply wait for the current
 master to lose its lock.  Current master state is held in the metadata table
-and Zookeeper (see a href=#fateFATE/a)./p
+and Zookeeper (see a href=#fate-14FATE/a)./p
 h3 id=write-ahead-logWrite ahead log/h3
 pIn version 1.4, tablet servers send mutations to loggers which write to the 
local file system, not HDFS.br /
 Each mutation is written to multiple loggers, before being committed.  In 
normal configurations, loggers

svn commit: r1569514 - /accumulo/site/trunk/content/notable_features.mdtext

[elserj]

Author: elserj
Date: Tue Feb 18 20:10:27 2014
New Revision: 1569514

URL: http://svn.apache.org/r1569514
Log:
Fix broken anchor

Modified:
accumulo/site/trunk/content/notable_features.mdtext

Modified: accumulo/site/trunk/content/notable_features.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/notable_features.mdtext?rev=1569514r1=1569513r2=1569514view=diff
==
--- accumulo/site/trunk/content/notable_features.mdtext (original)
+++ accumulo/site/trunk/content/notable_features.mdtext Tue Feb 18 20:10:27 2014
@@ -70,7 +70,7 @@ When reading rows, there is no requireme
 Multiple masters can be configured.  Zookeeper locks are used to determine
 which master is active.  The remaining masters simply wait for the current
 master to lose its lock.  Current master state is held in the metadata table
-and Zookeeper (see [FATE](#fate)).
+and Zookeeper (see [FATE](#fate-14)).
 
 ### Write ahead log
 

svn commit: r898430 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/

[elserj]

Author: elserj
Date: Tue Feb 18 20:11:20 2014
New Revision: 898430

Log:
Publishing svnmucc operation to accumulo site by elserj

Added:
websites/production/accumulo/content/
  - copied from r898429, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/apidocs/
  - copied from r898429, websites/production/accumulo/content/1.4/apidocs/
websites/production/accumulo/content/1.5/apidocs/
  - copied from r898429, websites/production/accumulo/content/1.5/apidocs/

[2/3] git commit: ACCUMULO-1961 fixing warnings

[ecn]

ACCUMULO-1961 fixing warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/732f037e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/732f037e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/732f037e

Branch: refs/heads/master
Commit: 732f037ea029f32715ffeff82b6cd2e880e2fdf6
Parents: 91eb87c eea885a
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:17:17 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:17:17 2014 -0500

--

--

[1/3] git commit: ACCUMULO-1961 fixing warnings

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/master 9a2ac766f - d6a0e63b1


ACCUMULO-1961 fixing warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eea885a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eea885a3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eea885a3

Branch: refs/heads/master
Commit: eea885a32c1b586f1e87991fbeb0b7f8e07b9b9a
Parents: 8ca088e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:15:56 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:15:56 2014 -0500

--
 .../core/client/impl/TabletServerBatchReaderIterator.java   | 5 ++---
 .../core/client/mapreduce/lib/partition/RangePartitioner.java   | 1 -
 .../java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +-
 .../org/apache/accumulo/minicluster/MiniAccumuloCluster.java| 1 -
 .../java/org/apache/accumulo/server/util/SendLogToChainsaw.java | 1 -
 .../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java  | 1 -
 .../src/test/java/org/apache/accumulo/test/ShellServerTest.java | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index 6675344..6c6d1bb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -34,8 +34,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -65,7 +63,8 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index e29c791..d9d0e97 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -19,7 +19,6 @@ package 
org.apache.accumulo.core.client.mapreduce.lib.partition;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
--
diff --git 
a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java 
b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -86,7 +86,7 @@ public class AddressUtilTest extends TestCase {
 }
 try {
   log.info(AddressUtil is (hopefully) going to spit out an error about 
DNS lookups. you can ignore it.);
-  int result = AddressUtil.getAddressCacheNegativeTtl(null);
+  AddressUtil.getAddressCacheNegativeTtl(null);
   fail(The JVM Security settings cache DNS failures forever, this should 
cause an exception.);
 } catch(IllegalArgumentException exception) {
   assertTrue(true);

git commit: ACCUMULO-1961 fixing warnings

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 8ca088e6a - eea885a32


ACCUMULO-1961 fixing warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eea885a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eea885a3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eea885a3

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: eea885a32c1b586f1e87991fbeb0b7f8e07b9b9a
Parents: 8ca088e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:15:56 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:15:56 2014 -0500

--
 .../core/client/impl/TabletServerBatchReaderIterator.java   | 5 ++---
 .../core/client/mapreduce/lib/partition/RangePartitioner.java   | 1 -
 .../java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +-
 .../org/apache/accumulo/minicluster/MiniAccumuloCluster.java| 1 -
 .../java/org/apache/accumulo/server/util/SendLogToChainsaw.java | 1 -
 .../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java  | 1 -
 .../src/test/java/org/apache/accumulo/test/ShellServerTest.java | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index 6675344..6c6d1bb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -34,8 +34,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -65,7 +63,8 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index e29c791..d9d0e97 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -19,7 +19,6 @@ package 
org.apache.accumulo.core.client.mapreduce.lib.partition;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
--
diff --git 
a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java 
b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -86,7 +86,7 @@ public class AddressUtilTest extends TestCase {
 }
 try {
   log.info(AddressUtil is (hopefully) going to spit out an error about 
DNS lookups. you can ignore it.);
-  int result = AddressUtil.getAddressCacheNegativeTtl(null);
+  AddressUtil.getAddressCacheNegativeTtl(null);
   fail(The JVM Security settings cache DNS failures forever, this should 
cause an exception.);
 } catch(IllegalArgumentException exception) {
   assertTrue(true);

[1/2] git commit: ACCUMULO-1961 fixing warnings

[ecn]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 91eb87c48 - 732f037ea


ACCUMULO-1961 fixing warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eea885a3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eea885a3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eea885a3

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: eea885a32c1b586f1e87991fbeb0b7f8e07b9b9a
Parents: 8ca088e
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:15:56 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:15:56 2014 -0500

--
 .../core/client/impl/TabletServerBatchReaderIterator.java   | 5 ++---
 .../core/client/mapreduce/lib/partition/RangePartitioner.java   | 1 -
 .../java/org/apache/accumulo/fate/util/AddressUtilTest.java | 2 +-
 .../org/apache/accumulo/minicluster/MiniAccumuloCluster.java| 1 -
 .../java/org/apache/accumulo/server/util/SendLogToChainsaw.java | 1 -
 .../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java  | 1 -
 .../src/test/java/org/apache/accumulo/test/ShellServerTest.java | 2 +-
 7 files changed, 4 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
index 6675344..6c6d1bb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
@@ -34,8 +34,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.accumulo.trace.instrument.TraceRunnable;
-import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -65,7 +63,8 @@ import 
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.ThriftUtil;
-import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.TraceRunnable;
+import org.apache.accumulo.trace.instrument.Tracer;
 import org.apache.hadoop.io.Text;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index e29c791..d9d0e97 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -19,7 +19,6 @@ package 
org.apache.accumulo.core.client.mapreduce.lib.partition;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eea885a3/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
--
diff --git 
a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java 
b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
@@ -86,7 +86,7 @@ public class AddressUtilTest extends TestCase {
 }
 try {
   log.info(AddressUtil is (hopefully) going to spit out an error about 
DNS lookups. you can ignore it.);
-  int result = AddressUtil.getAddressCacheNegativeTtl(null);
+  AddressUtil.getAddressCacheNegativeTtl(null);
   fail(The JVM Security settings cache DNS failures forever, this should 
cause an exception.);
 } catch(IllegalArgumentException exception) {
   assertTrue(true);

[2/2] git commit: ACCUMULO-1961 fixing warnings

[ecn]

ACCUMULO-1961 fixing warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/732f037e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/732f037e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/732f037e

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 732f037ea029f32715ffeff82b6cd2e880e2fdf6
Parents: 91eb87c eea885a
Author: Eric Newton eric.new...@gmail.com
Authored: Tue Feb 18 15:17:17 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Tue Feb 18 15:17:17 2014 -0500

--

--

git commit: ACCUMULO-1961 Fix more recently introduced javadoc problems.

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 732f037ea - 4abb3f1af


ACCUMULO-1961 Fix more recently introduced javadoc problems.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4abb3f1a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4abb3f1a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4abb3f1a

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4abb3f1afd7c0f44cb71671148629cfcbbf5746f
Parents: 732f037
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Feb 18 15:33:36 2014 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Feb 18 15:33:36 2014 -0500

--
 .../java/org/apache/accumulo/core/client/Instance.java| 10 --
 .../accumulo/server/watcher/MonitorLog4jWatcher.java  | 10 ++
 2 files changed, 6 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java 
b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index c6f6f33..05cc7f2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -121,14 +121,13 @@ public interface Instance {
*/
   @Deprecated
   Connector getConnector(String user, CharSequence pass) throws 
AccumuloException, AccumuloSecurityException;
-  
+
   /**
* Returns the AccumuloConfiguration to use when interacting with this 
instance.
* 
* @return the AccumuloConfiguration that specifies properties related to 
interacting with this instance
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and 
never should have been exposed.
-   * @see {@link InstanceOperations#getConfiguration()} for client-side 
reading of the server-side configuration.
+   * @deprecated since 1.6.0. This method makes very little sense in the 
context of the client API and never should have been exposed.
+   * @see {@link InstanceOperations#getSystemConfiguration()} for client-side 
reading of the server-side configuration.
*/
   @Deprecated
   AccumuloConfiguration getConfiguration();
@@ -138,8 +137,7 @@ public interface Instance {
* 
* @param conf
*  accumulo configuration
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and 
never should have been exposed.
+   * @deprecated since 1.6.0. This method makes very little sense in the 
context of the client API and never should have been exposed.
* @see {@link InstanceOperations#setProperty(String, String)}
*/
   @Deprecated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
 
b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
index d0ca27f..ac3426e 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
@@ -43,12 +43,6 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   private boolean loggingDisabled = false;
   protected String path;
 
-  /**
-   * @param zkPath
-   * @param filename
-   * @param delay
-   * @param propertyName
-   */
   public MonitorLog4jWatcher(String instance, String filename, int delay) {
 super(filename);
 setDelay(delay);
@@ -78,7 +72,7 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   resetLogger();
   return;
 }
-
+
 synchronized (lock) {
   // We might triggered by file-reloading or from ZK update.
   // Either way will result in log-forwarding being restarted
@@ -87,7 +81,7 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   resetLogger();
 }
   }
-  
+
   private void resetLogger() {
 // Force a reset on the logger's configuration
 LogManager.resetConfiguration();