[1/2] accumulo git commit: Clarify the first instance of "Thrift" as "Apache Thrift" throughout website

2016-04-25 Thread elserj
Repository: accumulo
Updated Branches:
  refs/heads/asf-site 7a477677b -> fda351ecb
  refs/heads/gh-pages 29181962b -> f1c12658b


Clarify the first instance of "Thrift" as "Apache Thrift" throughout website


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

Branch: refs/heads/gh-pages
Commit: f1c12658b545c2c4378f4913f15f6fd628bef279
Parents: 2918196
Author: Josh Elser 
Authored: Mon Apr 25 11:51:24 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:51:24 2016 -0400

--
 doap_Accumulo.rdf  | 2 +-
 notable_features.md| 2 +-
 projects.md| 2 +-
 release_notes/1.5.1.md | 2 +-
 release_notes/1.5.2.md | 2 +-
 release_notes/1.5.3.md | 2 +-
 release_notes/1.6.1.md | 2 +-
 release_notes/1.6.5.md | 2 +-
 release_notes/1.7.0.md | 2 +-
 release_notes/1.7.1.md | 2 +-
 source.md  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1c12658/doap_Accumulo.rdf
--
diff --git a/doap_Accumulo.rdf b/doap_Accumulo.rdf
index 6e046a3..f6e3d57 100644
--- a/doap_Accumulo.rdf
+++ b/doap_Accumulo.rdf
@@ -27,7 +27,7 @@
 Apache Accumulo
 https://accumulo.apache.org"; />
 https://accumulo.apache.org"; />
-The Apache Accumulo sorted, distributed key/value store is 
based on Google's BigTable design. It is built on top of Apache Hadoop, 
Zookeeper, and Thrift. It features a few novel improvements on the BigTable 
design in the form of cell-level access labels and a server-side programming 
mechanism that can modify key/value pairs at various points in the data 
management process.
+The Apache Accumulo sorted, distributed key/value store is 
based on Google's BigTable design. It is built on top of Apache Hadoop, Apache 
Zookeeper, and Apache Thrift. It features a few novel improvements on the 
BigTable design in the form of cell-level access labels and a server-side 
programming mechanism that can modify key/value pairs at various points in the 
data management process.
 https://issues.apache.org/jira/browse/ACCUMULO"; />
 https://accumulo.apache.org/mailing_list"; />
 https://accumulo.apache.org/downloads"; />

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1c12658/notable_features.md
--
diff --git a/notable_features.md b/notable_features.md
index 9aa292f..e9c4e27 100644
--- a/notable_features.md
+++ b/notable_features.md
@@ -258,7 +258,7 @@ could be different from the Accumulo nodes.
 
 Accumulo can be a source and/or sink for map reduce jobs.
 
-### Thrift Proxy
+### Apache Thrift Proxy
 
 The Accumulo client code contains a lot of complexity.  For example, the 
 client code locates tablets, retries in the case of failures, and supports 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1c12658/projects.md
--
diff --git a/projects.md b/projects.md
index 8798877..6cb90b7 100644
--- a/projects.md
+++ b/projects.md
@@ -32,7 +32,7 @@ is an application of Accumulo continuous ingest (CI) test on 
Gora which verifies
  ProxyInstance
 
 ProxyInstance is a Java Instance implementation of the Accumulo Instance 
interface that communicates with
-an Accumulo cluster via an Accumulo Thrift proxy server. 
[Documentation](https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual)
 and
+an Accumulo cluster via Accumulo's Apache Thrift proxy server. 
[Documentation](https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual)
 and
 [code](https://github.com/JHUAPL/accumulo-proxy-instance) are available.
 
  Graphulo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1c12658/release_notes/1.5.1.md
--
diff --git a/release_notes/1.5.1.md b/release_notes/1.5.1.md
index 6d08b6a..df5203f 100644
--- a/release_notes/1.5.1.md
+++ b/release_notes/1.5.1.md
@@ -41,7 +41,7 @@ In previous versions, units of memory had to be provided as 
upper-case (e.g. '2G
 Additionally, a non-intuitive error was printed when a lower-case unit was 
provided.
 [ACCUMULO-1933][7] allows lower-case memory units in all Accumulo 
configurations.
 
-### Thrift maximum frame size
+### Apache Thrift maximum frame size
 
 Apache Thrift is used as the internal RPC service. [ACCUMULO-2360][14] allows 
 users to configure the maximum frame size an Accumulo server will read. This 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1c12658/release_notes/1.5.2.md

[2/2] accumulo git commit: Jekyll build from gh-pages:f1c1265

2016-04-25 Thread elserj
Jekyll build from gh-pages:f1c1265

Clarify the first instance of "Thrift" as "Apache Thrift" throughout website


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

Branch: refs/heads/asf-site
Commit: fda351ecb6a2cf6e6b19a9f827dc96b60be6bca5
Parents: 7a47767
Author: Josh Elser 
Authored: Mon Apr 25 11:51:24 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:51:51 2016 -0400

--
 doap_Accumulo.rdf| 2 +-
 feed.xml | 4 ++--
 notable_features.html| 2 +-
 projects.html| 2 +-
 release_notes/1.5.1.html | 2 +-
 release_notes/1.5.2.html | 2 +-
 release_notes/1.5.3.html | 2 +-
 release_notes/1.6.1.html | 2 +-
 release_notes/1.6.5.html | 2 +-
 release_notes/1.7.0.html | 2 +-
 release_notes/1.7.1.html | 2 +-
 source.html  | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fda351ec/doap_Accumulo.rdf
--
diff --git a/doap_Accumulo.rdf b/doap_Accumulo.rdf
index 6e046a3..f6e3d57 100644
--- a/doap_Accumulo.rdf
+++ b/doap_Accumulo.rdf
@@ -27,7 +27,7 @@
 Apache Accumulo
 https://accumulo.apache.org"; />
 https://accumulo.apache.org"; />
-The Apache Accumulo sorted, distributed key/value store is 
based on Google's BigTable design. It is built on top of Apache Hadoop, 
Zookeeper, and Thrift. It features a few novel improvements on the BigTable 
design in the form of cell-level access labels and a server-side programming 
mechanism that can modify key/value pairs at various points in the data 
management process.
+The Apache Accumulo sorted, distributed key/value store is 
based on Google's BigTable design. It is built on top of Apache Hadoop, Apache 
Zookeeper, and Apache Thrift. It features a few novel improvements on the 
BigTable design in the form of cell-level access labels and a server-side 
programming mechanism that can modify key/value pairs at various points in the 
data management process.
 https://issues.apache.org/jira/browse/ACCUMULO"; />
 https://accumulo.apache.org/mailing_list"; />
 https://accumulo.apache.org/downloads"; />

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fda351ec/feed.xml
--
diff --git a/feed.xml b/feed.xml
index 862854d..1d304c1 100644
--- a/feed.xml
+++ b/feed.xml
@@ -6,8 +6,8 @@
 
 https://accumulo.apache.org/
 https://accumulo.apache.org/feed.xml"; rel="self" 
type="application/rss+xml"/>
-Mon, 25 Apr 2016 11:45:42 -0400
-Mon, 25 Apr 2016 11:45:42 -0400
+Mon, 25 Apr 2016 11:51:47 -0400
+Mon, 25 Apr 2016 11:51:47 -0400
 Jekyll v3.0.3
 
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fda351ec/notable_features.html
--
diff --git a/notable_features.html b/notable_features.html
index 25e0bfb..9a90644 100644
--- a/notable_features.html
+++ b/notable_features.html
@@ -495,7 +495,7 @@ could be different from the Accumulo nodes.
 
 Accumulo can be a source and/or sink for map reduce jobs.
 
-Thrift Proxy
+Apache Thrift Proxy
 
 The Accumulo client code contains a lot of complexity.  For example, the 
 client code locates tablets, retries in the case of failures, and supports 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fda351ec/projects.html
--
diff --git a/projects.html b/projects.html
index 1710936..31a0a72 100644
--- a/projects.html
+++ b/projects.html
@@ -267,7 +267,7 @@ is an application of Accumulo continuous ingest (CI) test 
on Gora which verifies
 ProxyInstance
 
 ProxyInstance is a Java Instance implementation of the Accumulo Instance 
interface that communicates with
-an Accumulo cluster via an Accumulo Thrift proxy server. https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual";>Documentation
 and
+an Accumulo cluster via Accumulo’s Apache Thrift proxy server. https://jhuapl.github.io/accumulo-proxy-instance/proxy_instance_user_manual";>Documentation
 and
 https://github.com/JHUAPL/accumulo-proxy-instance";>code are 
available.
 
 Graphulo

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fda351ec/release_notes/1.5.1.html
--
diff --git a/release_notes/1.5.1.html b/release_notes/1.5.1.html
index 4bfac11..00791a3 100644
--- a/release_notes/1.5.1.html
+++ b/release_notes/1.5.1.html
@@ -271,7 +271,7 @@ startup to prefer IPv4 over IPv6.
 Additionally, a non-intuitive 

[3/4] accumulo git commit: Jekyll build from gh-pages:2918196

2016-04-25 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/isolation.html
--
diff --git a/1.6/examples/isolation.html b/1.6/examples/isolation.html
index 6f14a8e..81178b9 100644
--- a/1.6/examples/isolation.html
+++ b/1.6/examples/isolation.html
@@ -277,8 +277,9 @@ finished
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/mapred.html
--
diff --git a/1.6/examples/mapred.html b/1.6/examples/mapred.html
index 5b74b07..ccd2645 100644
--- a/1.6/examples/mapred.html
+++ b/1.6/examples/mapred.html
@@ -393,8 +393,9 @@ WordCount example, then the resulting counts should just 
double.)
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/maxmutation.html
--
diff --git a/1.6/examples/maxmutation.html b/1.6/examples/maxmutation.html
index 967b0fa..af24997 100644
--- a/1.6/examples/maxmutation.html
+++ b/1.6/examples/maxmutation.html
@@ -275,8 +275,9 @@ ERROR : Constraint violates : 
ConstraintViolationSummary(constrainClass:org.apac
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/regex.html
--
diff --git a/1.6/examples/regex.html b/1.6/examples/regex.html
index 0eebb96..b7d989b 100644
--- a/1.6/examples/regex.html
+++ b/1.6/examples/regex.html
@@ -286,8 +286,9 @@ dogrow dogcf:dogcq [] 1357844987994 falsedogvalue
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/1.6/examples/reservations.html
--
diff --git a/1.6/examples/reservations.html b/1.6/examples/reservations.html
index f4251ab..44ebfb0 100644
--- a/1.6/examples/reservations.html
+++ b/1.6/examples/reservations.html
@@ -295,8 +295,9 @@ the conditional mutation will fail and the example code 
will retry.
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the ht

[4/4] accumulo git commit: Jekyll build from gh-pages:2918196

2016-04-25 Thread elserj
Jekyll build from gh-pages:2918196

Ensure "Apache " is explicit on the website


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

Branch: refs/heads/asf-site
Commit: 7a477677b38996fe7e148a00345791a1cf1506ad
Parents: 906f782
Author: Josh Elser 
Authored: Mon Apr 25 11:45:47 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:45:47 2016 -0400

--
 1.4/examples/batch.html  |  5 +++--
 1.4/examples/bloom.html  |  5 +++--
 1.4/examples/bulkIngest.html |  5 +++--
 1.4/examples/combiner.html   |  5 +++--
 1.4/examples/constraints.html|  5 +++--
 1.4/examples/dirlist.html|  5 +++--
 1.4/examples/filedata.html   |  5 +++--
 1.4/examples/filter.html |  5 +++--
 1.4/examples/helloworld.html |  5 +++--
 1.4/examples/index.html  |  5 +++--
 1.4/examples/isolation.html  |  5 +++--
 1.4/examples/mapred.html |  5 +++--
 1.4/examples/shard.html  |  5 +++--
 1.4/examples/visibility.html |  5 +++--
 1.4/user_manual/Accumulo_Design.html |  5 +++--
 1.4/user_manual/Accumulo_Shell.html  |  5 +++--
 1.4/user_manual/Administration.html  |  5 +++--
 1.4/user_manual/Analytics.html   |  5 +++--
 1.4/user_manual/Contents.html|  5 +++--
 1.4/user_manual/Development_Clients.html |  5 +++--
 1.4/user_manual/High_Speed_Ingest.html   |  5 +++--
 1.4/user_manual/Introduction.html|  5 +++--
 1.4/user_manual/Security.html|  5 +++--
 1.4/user_manual/Shell_Commands.html  |  5 +++--
 1.4/user_manual/Table_Configuration.html |  5 +++--
 1.4/user_manual/Table_Design.html|  5 +++--
 1.4/user_manual/Writing_Accumulo_Clients.html|  5 +++--
 1.4/user_manual/accumulo_user_manual.html|  5 +++--
 1.4/user_manual/index.html   |  5 +++--
 1.5/examples/batch.html  |  5 +++--
 1.5/examples/bloom.html  |  5 +++--
 1.5/examples/bulkIngest.html |  5 +++--
 1.5/examples/classpath.html  |  5 +++--
 1.5/examples/client.html |  5 +++--
 1.5/examples/combiner.html   |  5 +++--
 1.5/examples/constraints.html|  5 +++--
 1.5/examples/dirlist.html|  5 +++--
 1.5/examples/export.html |  5 +++--
 1.5/examples/filedata.html   |  5 +++--
 1.5/examples/filter.html |  5 +++--
 1.5/examples/helloworld.html |  5 +++--
 1.5/examples/index.html  |  5 +++--
 1.5/examples/isolation.html  |  5 +++--
 1.5/examples/mapred.html |  5 +++--
 1.5/examples/maxmutation.html|  5 +++--
 1.5/examples/regex.html  |  5 +++--
 1.5/examples/rowhash.html|  5 +++--
 1.5/examples/shard.html  |  5 +++--
 1.5/examples/tabletofile.html|  5 +++--
 1.5/examples/terasort.html   |  5 +++--
 1.5/examples/visibility.html |  5 +++--
 1.6/examples/batch.html  |  5 +++--
 1.6/examples/bloom.html  |  5 +++--
 1.6/examples/bulkIngest.html |  5 +++--
 1.6/examples/classpath.html  |  5 +++--
 1.6/examples/client.html |  5 +++--
 1.6/examples/combiner.html   |  5 +++--
 1.6/examples/constraints.html|  5 +++--
 1.6/examples/dirlist.html|  5 +++--
 1.6/examples/export.html |  5 +++--
 1.6/examples/filedata.html   |  5 +++--
 1.6/examples/filter.html |  5 +++--
 1.6/examples/helloworld.html |  5 +++--
 1.6/ex

[2/4] accumulo git commit: Jekyll build from gh-pages:2918196

2016-04-25 Thread elserj
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/Administration.html
--
diff --git a/user_manual_1.3-incubating/Administration.html 
b/user_manual_1.3-incubating/Administration.html
index a966686..df0bd49 100644
--- a/user_manual_1.3-incubating/Administration.html
+++ b/user_manual_1.3-incubating/Administration.html
@@ -399,8 +399,9 @@ $ACCUMULO/logs/.
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/Analytics.html
--
diff --git a/user_manual_1.3-incubating/Analytics.html 
b/user_manual_1.3-incubating/Analytics.html
index e68b9ac..176ee49 100644
--- a/user_manual_1.3-incubating/Analytics.html
+++ b/user_manual_1.3-incubating/Analytics.html
@@ -385,8 +385,9 @@ accumulo/docs/examples/README.mapred
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/Contents.html
--
diff --git a/user_manual_1.3-incubating/Contents.html 
b/user_manual_1.3-incubating/Contents.html
index 1d2056d..28e661a 100644
--- a/user_manual_1.3-incubating/Contents.html
+++ b/user_manual_1.3-incubating/Contents.html
@@ -424,8 +424,9 @@
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/High_Speed_Ingest.html
--
diff --git a/user_manual_1.3-incubating/High_Speed_Ingest.html 
b/user_manual_1.3-incubating/High_Speed_Ingest.html
index 99faff0..5fa9b71 100644
--- a/user_manual_1.3-incubating/High_Speed_Ingest.html
+++ b/user_manual_1.3-incubating/High_Speed_Ingest.html
@@ -317,8 +317,9 @@ accumulo/docs/examples/README.mapred
 
   Copyright © 2011-2016 The Apache Software
 Foundation, Licensed under the https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the https://www.apache.org";>Apache 
Software Foundation.
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the https://www.apache.org";>Apache Software 
Foundation.
 
   Site created with https://getbootstrap.com";>Bootstrap 
including icons from
 https://glyphicons.com";>GLYPHICONS and http://fontawesome.io";>Font Awesome.

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7a477677/user_manual_1.3-incubating/Introduction.html
--
diff --git a/user_manual_1.3-incubating/Introduction.html 
b/user_manual_1.3-incubating/In

[1/4] accumulo git commit: Ensure "Apache " is explicit on the website

2016-04-25 Thread elserj
Repository: accumulo
Updated Branches:
  refs/heads/asf-site 906f782ac -> 7a477677b
  refs/heads/gh-pages 54012968b -> 29181962b


Ensure "Apache " is explicit on the website


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

Branch: refs/heads/gh-pages
Commit: 29181962b249564c2748cfee9482809e1221824e
Parents: 5401296
Author: Josh Elser 
Authored: Mon Apr 25 11:43:22 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:43:22 2016 -0400

--
 _includes/footer.md |  5 +++--
 index.md| 16 
 2 files changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/29181962/_includes/footer.md
--
diff --git a/_includes/footer.md b/_includes/footer.md
index 79424c9..fe76263 100644
--- a/_includes/footer.md
+++ b/_includes/footer.md
@@ -5,8 +5,9 @@
 
 Copyright © 2011-{{ site.time | date: '%Y' }} The Apache Software
 Foundation, Licensed under the [Apache License, Version 2.0][AL2]. Apache
-Accumulo, Accumulo, Apache, the Apache feather logo, and the Apache Accumulo
-project logo are trademarks of the [Apache Software Foundation][ASF].
+Accumulo, Accumulo, Apache Hadoop, Apache HBase, Apache Cassandra,
+Apache Thrift, Apache, the Apache feather logo, and the Apache Accumulo project
+logo are trademarks of the [Apache Software Foundation][ASF].
 
 Site created with [Bootstrap][BOOTSTRAP] including icons from
 [GLYPHICONS][GLYPHICONS] and [Font Awesome][FONTAWE].

http://git-wip-us.apache.org/repos/asf/accumulo/blob/29181962/index.md
--
diff --git a/index.md b/index.md
index a69..b18caf1 100644
--- a/index.md
+++ b/index.md
@@ -13,21 +13,21 @@ The Apache Accumulo™ sorted, distributed key/value 
store is a robust, scal
 
 
 Apache Accumulo is based on Google's [BigTable][1] design and is built on
-top of Apache [Hadoop][2], [Zookeeper][3], and [Thrift][4].  Apache Accumulo 
features a few novel 
+top of [Apache Hadoop][2], [Apache Zookeeper][3], and [Apache Thrift][4].  
Apache Accumulo features a few novel 
 improvements on the BigTable design in the form of cell-based access control 
and a server-side
 programming mechanism that can modify key/value pairs at various points in the
 data management process.  Other notable improvements and feature are outlined
 [here](notable_features).
 
 Google published the design of BigTable in 2006.  Several other open source
-projects have implemented aspects of this design including [HBase][5], 
[Hypertable][6],
-and [Cassandra][7].  Accumulo began its development in 2008 and joined the 
[Apache community][8] in 2011.
+projects have implemented aspects of this design including [Apache HBase][5], 
[Hypertable][6],
+and [Apache Cassandra][7].  Accumulo began its development in 2008 and joined 
the [Apache community][8] in 2011.
 
 [1]: https://research.google.com/archive/bigtable.html "BigTable"
-[2]: https://hadoop.apache.org   "Hadoop"
-[3]: https://zookeeper.apache.org "Zookeeper"
-[4]: https://thrift.apache.org"Thrift"
-[5]: https://hbase.apache.org "HBase"
+[2]: https://hadoop.apache.org   "Apache Hadoop"
+[3]: https://zookeeper.apache.org "Apache Zookeeper"
+[4]: https://thrift.apache.org"Apache Thrift"
+[5]: https://hbase.apache.org "Apache HBase"
 [6]: http://hypertable.com   "Hypertable"
-[7]: https://cassandra.apache.org "Cassandra"
+[7]: https://cassandra.apache.org "Apache Cassandra"
 [8]: https://www.apache.org  "Apache Software Foundation"



[1/6] accumulo git commit: ACCUMULO-1507 Turn off yet another broken commons-vfs2 test

2016-04-25 Thread elserj
Repository: accumulo
Updated Branches:
  refs/heads/1.6 0fee43f50 -> 397de589e
  refs/heads/1.7 9024dd91f -> 523e7905f
  refs/heads/master c8e6fe749 -> a605d2251


ACCUMULO-1507 Turn off yet another broken commons-vfs2 test


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

Branch: refs/heads/1.6
Commit: 397de589ee7119a48d4059c880388616320432f0
Parents: 0fee43f
Author: Josh Elser 
Authored: Mon Apr 25 09:41:23 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 09:41:23 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/397de589/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
--
diff --git 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
index 5adab86..99420c1 100644
--- 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
+++ 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
@@ -178,6 +178,7 @@ public class AccumuloReloadingVFSClassLoaderTest {
   }
 
   @Test
+  @Ignore
   public void testModifiedClass() throws Exception {
 
 FileObject testDir = vfs.resolveFile(folder1.getRoot().toURI().toString());



[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-04-25 Thread elserj
Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 523e7905fe0c671f9eb2267c3f6087a01e8bdf77
Parents: 9024dd9 397de58
Author: Josh Elser 
Authored: Mon Apr 25 11:12:30 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:12:30 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/523e7905/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
--



[2/6] accumulo git commit: ACCUMULO-1507 Turn off yet another broken commons-vfs2 test

2016-04-25 Thread elserj
ACCUMULO-1507 Turn off yet another broken commons-vfs2 test


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

Branch: refs/heads/1.7
Commit: 397de589ee7119a48d4059c880388616320432f0
Parents: 0fee43f
Author: Josh Elser 
Authored: Mon Apr 25 09:41:23 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 09:41:23 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/397de589/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
--
diff --git 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
index 5adab86..99420c1 100644
--- 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
+++ 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
@@ -178,6 +178,7 @@ public class AccumuloReloadingVFSClassLoaderTest {
   }
 
   @Test
+  @Ignore
   public void testModifiedClass() throws Exception {
 
 FileObject testDir = vfs.resolveFile(folder1.getRoot().toURI().toString());



[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2016-04-25 Thread elserj
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: 523e7905fe0c671f9eb2267c3f6087a01e8bdf77
Parents: 9024dd9 397de58
Author: Josh Elser 
Authored: Mon Apr 25 11:12:30 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:12:30 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/523e7905/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
--



[6/6] accumulo git commit: Merge branch '1.7'

2016-04-25 Thread elserj
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: a605d22513e1b75ae534a3457590545daa9df22a
Parents: c8e6fe7 523e790
Author: Josh Elser 
Authored: Mon Apr 25 11:12:39 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 11:12:39 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--




[3/6] accumulo git commit: ACCUMULO-1507 Turn off yet another broken commons-vfs2 test

2016-04-25 Thread elserj
ACCUMULO-1507 Turn off yet another broken commons-vfs2 test


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

Branch: refs/heads/master
Commit: 397de589ee7119a48d4059c880388616320432f0
Parents: 0fee43f
Author: Josh Elser 
Authored: Mon Apr 25 09:41:23 2016 -0400
Committer: Josh Elser 
Committed: Mon Apr 25 09:41:23 2016 -0400

--
 .../start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/397de589/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
--
diff --git 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
index 5adab86..99420c1 100644
--- 
a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
+++ 
b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/AccumuloReloadingVFSClassLoaderTest.java
@@ -178,6 +178,7 @@ public class AccumuloReloadingVFSClassLoaderTest {
   }
 
   @Test
+  @Ignore
   public void testModifiedClass() throws Exception {
 
 FileObject testDir = vfs.resolveFile(folder1.getRoot().toURI().toString());