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/fb5fc55d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb5fc55d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb5fc55d Branch: refs/heads/master Commit: fb5fc55d9d1dde1e638db816f45e139d0cad9095 Parents: 1bd6fe0 6861d7b Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Sep 10 19:07:01 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Sep 10 19:07:01 2015 -0400 ---------------------------------------------------------------------- NOTICE | 2 +- assemble/pom.xml | 2 +- core/pom.xml | 2 +- docs/pom.xml | 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 8 +++++--- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- trace/pom.xml | 2 +- 21 files changed, 25 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/core/pom.xml ---------------------------------------------------------------------- diff --cc core/pom.xml index a65639e,a56a909..5ab5255 --- a/core/pom.xml +++ b/core/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-core</artifactId> - <name>Core</name> + <name>Apache Accumulo Core</name> <description>Apache Accumulo core libraries.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/docs/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/fate/pom.xml ---------------------------------------------------------------------- diff --cc fate/pom.xml index b93d788,489bc07..080ef6c --- a/fate/pom.xml +++ b/fate/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-fate</artifactId> - <name>Fate</name> + <name>Apache Accumulo Fate</name> <description>A FAult-Tolerant Executor library used by Apache Accumulo.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/minicluster/pom.xml ---------------------------------------------------------------------- diff --cc minicluster/pom.xml index afd459c,4aa05c5..222a46e --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-minicluster</artifactId> - <name>MiniCluster</name> + <name>Apache Accumulo MiniCluster</name> <description>A library for launching and running a standalone instance of Apache Accumulo for testing.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 3b01e5c,8b0c656..ba66b01 --- a/pom.xml +++ b/pom.xml @@@ -24,9 -24,9 +24,9 @@@ </parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Accumulo</name> + <name>Apache Accumulo Project</name> <description>Apache Accumulo is a sorted, distributed key/value store 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.</description> <!-- this URL is where the site derived via the maven-site-plugin ends up, not the generic site --> <url>http://accumulo.apache.org/maven-site/</url> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/proxy/pom.xml ---------------------------------------------------------------------- diff --cc proxy/pom.xml index 2173ec0,5a4c882..2aee90b --- a/proxy/pom.xml +++ b/proxy/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-proxy</artifactId> - <name>Proxy</name> + <name>Apache Accumulo Proxy</name> <description>A server for Apache Accumulo that proxies connections from any language supported by Apache Thrift.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/master/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/native/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/tracer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/server/tserver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/shell/pom.xml ---------------------------------------------------------------------- diff --cc shell/pom.xml index 55a0367,782afa1..5cf1545 --- a/shell/pom.xml +++ b/shell/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-shell</artifactId> - <name>Shell</name> + <name>Apache Accumulo Shell</name> <description>An interactive shell for accessing Apache Accumulo via a command line interface.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/start/pom.xml ---------------------------------------------------------------------- diff --cc start/pom.xml index d6b874f,d72f7f5..9993555 --- a/start/pom.xml +++ b/start/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-start</artifactId> - <name>Start</name> + <name>Apache Accumulo Start</name> <description>A library for launching Apache Accumulo services.</description> <dependencies> <dependency> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/test/pom.xml ---------------------------------------------------------------------- diff --cc test/pom.xml index 901bd6c,6723559..e88bcfb --- a/test/pom.xml +++ b/test/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-test</artifactId> - <name>Testing</name> + <name>Apache Accumulo Testing</name> <description>Tests for Apache Accumulo.</description> <properties> <timeout.factor>1</timeout.factor> http://git-wip-us.apache.org/repos/asf/accumulo/blob/fb5fc55d/trace/pom.xml ---------------------------------------------------------------------- diff --cc trace/pom.xml index 481b8bc,d642e98..d8c5ef4 --- a/trace/pom.xml +++ b/trace/pom.xml @@@ -20,10 -20,10 +20,10 @@@ <parent> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-project</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <artifactId>accumulo-trace</artifactId> - <name>Trace</name> + <name>Apache Accumulo Trace</name> <description>A distributed tracing library for Apache Accumulo.</description> <dependencies> <dependency>
