This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 2f6becc17470132cf8cf1afea1de90a8dff61ced Author: Mike Miller <mmil...@apache.org> AuthorDate: Fri Sep 22 16:58:17 2017 -0400 ACCUMULO-4703 New formatter version code changes --- .../main/java/org/apache/accumulo/core/client/impl/Namespace.java | 1 - .../src/main/java/org/apache/accumulo/core/client/impl/Table.java | 1 - .../main/java/org/apache/accumulo/core/client/impl/Tables.java | 1 - .../java/org/apache/accumulo/core/conf/SiteConfigurationTest.java | 1 - .../java/org/apache/accumulo/iteratortest/IteratorTestOutput.java | 8 ++++---- .../main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java | 1 - .../org/apache/accumulo/test/functional/ChaoticBalancerIT.java | 1 - 7 files changed, 4 insertions(+), 10 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java index 83edeee..56d7073 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespace.java @@ -60,6 +60,5 @@ public class Namespace { throw new AssertionError("This should never happen: ID constructor should never return null."); } } - } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java index 74d783d..15517d9 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Table.java @@ -58,7 +58,6 @@ public class Table { throw new AssertionError("This should never happen: ID constructor should never return null."); } } - } } diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java index dfdc170..512c875 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java @@ -306,5 +306,4 @@ public class Tables { return singleName.get(0); } - } diff --git a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java index b42abca..92a0da4 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/SiteConfigurationTest.java @@ -71,5 +71,4 @@ public class SiteConfigurationTest { Assert.assertEquals(null, props.get("ignored.property")); Assert.assertEquals(Property.GENERAL_RPC_TIMEOUT.getDefaultValue(), props.get(Property.GENERAL_RPC_TIMEOUT.getKey())); } - } diff --git a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java index 4b670bb..cf1e50c 100644 --- a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java +++ b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/IteratorTestOutput.java @@ -39,11 +39,11 @@ public class IteratorTestOutput { * The IteratorTestCase proactively passed. */ PASSED, /** - * The IteratorTestCase proactively failed. - */ + * The IteratorTestCase proactively failed. + */ FAILED, /** - * The IteratorTestCase completed, but the pass/fail should be determined by the other context. - */ + * The IteratorTestCase completed, but the pass/fail should be determined by the other context. + */ COMPLETED } diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index 7c9498d..47b5292 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -492,7 +492,6 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa return Collections.emptyIterator(); } } - } private void run() { diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java index d7e5129..7532b54 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java @@ -79,5 +79,4 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness { c.tableOperations().flush(tableName, null, null, true); VerifyIngest.verifyIngest(c, vopts, new ScannerOpts()); } - } -- To stop receiving notification emails like this one, please contact "commits@accumulo.apache.org" <commits@accumulo.apache.org>.