You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/06/21 21:50:43 UTC

[12/12] accumulo git commit: Merge branch '1.8'

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 8c2ecf823b8f3ddaf71c3d1871f04d8815218e91
Parents: c2a3b68 782135b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Tue Jun 21 17:46:27 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Tue Jun 21 17:46:27 2016 -0400

----------------------------------------------------------------------
 minicluster/pom.xml | 1 +
 pom.xml             | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c2ecf82/minicluster/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c2ecf82/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a3331e0,a24598b..a19ab8e
--- a/pom.xml
+++ b/pom.xml
@@@ -136,9 -137,10 +136,10 @@@
      <hadoop.version>2.2.0</hadoop.version>
      <htrace.version>3.1.0-incubating</htrace.version>
      <httpclient.version>3.1</httpclient.version>
+     <it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
      <jetty.version>9.1.5.v20140505</jetty.version>
 -    <maven.compiler.source>1.7</maven.compiler.source>
 -    <maven.compiler.target>1.7</maven.compiler.target>
 +    <maven.compiler.source>1.8</maven.compiler.source>
 +    <maven.compiler.target>1.8</maven.compiler.target>
      <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
      <maven.min-version>3.0.5</maven.min-version>
      <!-- surefire/failsafe plugin option -->