Return-Path: <commits-return-18426-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id CD7D1200B17
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 21 Jun 2016 23:50:35 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id CC2E7160A07; Tue, 21 Jun 2016 21:50:35 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 0CDDA160A6C
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 21 Jun 2016 23:50:34 +0200 (CEST)
Received: (qmail 55128 invoked by uid 500); 21 Jun 2016 21:50:34 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 54572 invoked by uid 99); 21 Jun 2016 21:50:33 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jun 2016 21:50:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 16858DFC15; Tue, 21 Jun 2016 21:50:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: ctubbsii@apache.org
To: commits@accumulo.apache.org
Date: Tue, 21 Jun 2016 21:50:38 -0000
Message-Id: <8f3996e737ae4118a0f77f84db1db4de@git.apache.org>
In-Reply-To: <2a5073850e934e019229f6530d8dbefc@git.apache.org>
References: <2a5073850e934e019229f6530d8dbefc@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [07/12] accumulo git commit: Merge branch '1.6' into 1.7
archived-at: Tue, 21 Jun 2016 21:50:36 -0000

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/2da2aafc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2da2aafc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2da2aafc

Branch: refs/heads/1.8
Commit: 2da2aafcde94dda7d39c83ce8ecab2f5a78e2a20
Parents: d3e687e 6d85034
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jun 21 17:42:45 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jun 21 17:42:45 2016 -0400

----------------------------------------------------------------------
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2da2aafc/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 27bed62,6b29f4c..d200561
--- a/pom.xml
+++ b/pom.xml
@@@ -130,12 -129,11 +130,13 @@@
      <forkCount>1</forkCount>
      <!-- overwritten in hadoop profiles -->
      <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>8.1.15.v20140411</jetty.version>
 -    <maven.compiler.source>1.6</maven.compiler.source>
 -    <maven.compiler.target>1.6</maven.compiler.target>
 +    <jetty.version>9.1.5.v20140505</jetty.version>
 +    <maven.compiler.source>1.7</maven.compiler.source>
 +    <maven.compiler.target>1.7</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 -->
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@@ -146,10 -144,11 +147,11 @@@
      <!-- overwritten in hadoop profiles -->
      <slf4j.version>1.7.5</slf4j.version>
      <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
+     <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
      <!-- Thrift version -->
      <thrift.version>0.9.1</thrift.version>
 -    <!-- ZooKeeper 3.4.x works also, but we're not using new features yet; this ensures 3.3.x compatibility. -->
 -    <zookeeper.version>3.3.6</zookeeper.version>
 +    <!-- ZooKeeper version -->
 +    <zookeeper.version>3.4.6</zookeeper.version>
    </properties>
    <dependencyManagement>
      <dependencies>