[accumulo] 02/02: ACCUMULO-4703 New formatter version code changes

2017-09-22 Thread mmiller
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 
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 
{
 

[accumulo] 01/02: ACCUMULO-4703 Updated mvn formatter plugin 2.0.1

2017-09-22 Thread mmiller
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 ed0204b15e2243ea2ab23ae9d0eced8a5d332156
Author: Mike Miller 
AuthorDate: Fri Sep 22 16:52:09 2017 -0400

ACCUMULO-4703 Updated mvn formatter plugin 2.0.1
---
 pom.xml | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4f3625e..7e267b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -944,9 +944,9 @@
   1.0.1
 
 
-  com.googlecode.maven-java-formatter-plugin
-  maven-java-formatter-plugin
-  0.4
+  net.revelc.code.formatter
+  formatter-maven-plugin
+  2.0.1
   
 ${maven.compiler.source}
 ${maven.compiler.source}
@@ -1343,8 +1343,8 @@
 
 
   
-
com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
+net.revelc.code.formatter
+formatter-maven-plugin
 [0,)
 
   format
@@ -1603,8 +1603,8 @@
 
   
   
-com.googlecode.maven-java-formatter-plugin
-maven-java-formatter-plugin
+net.revelc.code.formatter
+formatter-maven-plugin
 
   ${eclipseFormatterStyle}
 

-- 
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" .


[accumulo-website] branch master updated: Simplified documentation (#25)

2017-09-22 Thread mwalch
This is an automated email from the ASF dual-hosted git repository.

mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git


The following commit(s) were added to refs/heads/master by this push:
 new dc73330  Simplified documentation (#25)
dc73330 is described below

commit dc73330af05c462fd3dfb843282ca5f50805eebb
Author: Mike Walch 
AuthorDate: Fri Sep 22 11:59:59 2017 -0400

Simplified documentation (#25)

* Converted docs-unreleased collection to docs-2.0
* Documentation is now viewble at /docs/2.0/
---
 _config.yml| 28 +-
 .../administration/configuration-management.md |  0
 .../administration/configuration-properties.md |  0
 .../administration/fate.md |  0
 .../administration/in-depth-install.md |  0
 .../administration/kerberos.md |  0
 .../administration/monitoring-metrics.md   |  0
 .../administration/multivolume.md  |  0
 .../administration/replication.md  |  0
 .../administration/ssl.md  |  0
 .../administration/tracing.md  |  0
 .../development/development_tools.md   |  0
 .../development/high_speed_ingest.md   |  0
 .../development/iterators.md   |  0
 .../development/mapreduce.md   |  0
 .../development/proxy.md   |  0
 .../development/sampling.md|  0
 .../development/security.md|  0
 .../development/summaries.md   |  0
 .../getting-started/clients.md |  0
 .../getting-started/design.md  |  0
 .../getting-started/quick-install.md   |  0
 .../getting-started/shell.md   |  0
 .../getting-started/table_configuration.md |  0
 .../getting-started/table_design.md|  0
 {_docs-unreleased => _docs-2-0}/index.md   |  0
 .../troubleshooting/advanced.md|  0
 .../troubleshooting/basic.md   |  0
 .../troubleshooting/system-metadata-tables.md  |  0
 .../troubleshooting/tools.md   |  0
 _layouts/{docs-unreleased.html => docs-2.0.html}   |  2 +-
 ...17-06-29-accumulo-documentation-improvements.md |  9 ---
 contributor/making-release.md  | 13 +-
 33 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/_config.yml b/_config.yml
index ba4e972..bcad220 100644
--- a/_config.yml
+++ b/_config.yml
@@ -23,12 +23,9 @@ markdown: kramdown
 
 # Collection names cannot contain periods
 collections: 
-  docs-unreleased:
+  docs-2-0:
 output: true
-permalink: "/docs/unreleased/:path"
-#  docs-2-0:
-#output: true
-#permalink: "/docs/2.0/:path"
+permalink: "/docs/2.0/:path"
 
 defaults:
   -
@@ -55,29 +52,16 @@ defaults:
   -
 scope:
   path: ""
-  type: "docs-unreleased"
+  type: "docs-2-0"
 values:
-  layout: "docs-unreleased"
+  layout: "docs-2.0"
   title_prefix: "Accumulo Documentation - "
-  version: "unreleased"
+  version: "2.0"
   latest_release: "2.0.0"
-  docs_baseurl: "/docs/unreleased"
+  docs_baseurl: "/docs/2.0"
   javadoc_base: "https://static.javadoc.io/org.apache.accumulo;
   javadoc_core: 
"https://static.javadoc.io/org.apache.accumulo/accumulo-core/1.8.1;
   skiph1fortitle: "true"
-#  -
-#scope:
-#  path: ""
-#  type: "docs-2-0"
-#values:
-#  layout: "docs-2.0"
-#  title_prefix: "Accumulo Documentation - "
-#  version: "2.0"
-#  latest_release: "2.0.0"
-#  docs_baseurl: "/docs/2.0"
-#  javadoc_base: "https://static.javadoc.io/org.apache.accumulo;
-#  javadoc_core: 
"https://static.javadoc.io/org.apache.accumulo/accumulo-core/2.0.0;
-#  skiph1fortitle: "true"
 
 whitelist: [jekyll-redirect-from]
 plugins: [jekyll-redirect-from]
diff --git a/_docs-unreleased/administration/configuration-management.md 
b/_docs-2-0/administration/configuration-management.md
similarity index 100%
rename from _docs-unreleased/administration/configuration-management.md
rename to _docs-2-0/administration/configuration-management.md
diff --git a/_docs-unreleased/administration/configuration-properties.md 
b/_docs-2-0/administration/configuration-properties.md
similarity index 100%
rename from _docs-unreleased/administration/configuration-properties.md
rename to _docs-2-0/administration/configuration-properties.md
diff --git a/_docs-unreleased/administration/fate.md 
b/_docs-2-0/administration/fate.md
similarity index 100%
rename from _docs-unreleased/administration/fate.md
rename to _docs-2-0/administration/fate.md
diff --git a/_docs-unreleased/administration/in-depth-install.md 
b/_docs-2-0/administration/in-depth-install.md
similarity index