Return-Path: 
 <commits-return-17895-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0EC5619172
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Fri, 15 Apr 2016 22:34:43 +0000 (UTC)
Received: (qmail 34468 invoked by uid 500); 15 Apr 2016 22:34:37 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 34386 invoked by uid 500); 15 Apr 2016 22:34:37 -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 34285 invoked by uid 99); 15 Apr 2016 22:34:37 -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; Fri, 15 Apr 2016 22:34:37 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id AA179E03A9; Fri, 15 Apr 2016 22:34:37 +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: Fri, 15 Apr 2016 22:34:40 -0000
Message-Id: <eac51ae4a82e4bf68baffd8f9582af61@git.apache.org>
In-Reply-To: <89eba08c3d0148d187a03d368fa56f81@git.apache.org>
References: <89eba08c3d0148d187a03d368fa56f81@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/7] accumulo git commit: Merge branch '1.6' into 1.7

Merge branch '1.6' into 1.7

Conflicts:
	.travis.yml


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

Branch: refs/heads/master
Commit: 2d3330e7ea07328c79ffa601afed4ad559591eac
Parents: c37ba87 99e3023
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Fri Apr 15 18:31:28 2016 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Fri Apr 15 18:31:28 2016 -0400

----------------------------------------------------------------------
 .travis.yml | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d3330e7/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index b249511,64e44a2..5617017
--- a/.travis.yml
+++ b/.travis.yml
@@@ -13,8 -13,25 +13,24 @@@
  #  See the License for the specific language governing permissions and
  #  limitations under the License.
  language: java
+ notifications:
+   irc:
+     channels:
+       - "chat.freenode.net#accumulo"
+     use_notice: true
+     skip_join: true
+ # speed up builds; don't use with install
+ cache:
+   directories:
+     - $HOME/.m2
+ # skip pre-fetch of maven dependencies
+ install: true
  jdk:
-   - openjdk7
-   - oraclejdk7
    - oraclejdk8
- script: mvn clean verify -DskipITs
+   - oraclejdk7
+   - openjdk7
 -  - openjdk6
+ # clear any cache of accumulo artifacts, just in case; use https for central
+ before_script:
+   - rm -rf $HOME/.m2/repository/org/apache/accumulo
+   - echo "<settings xmlns='http://maven.apache.org/SETTINGS/1.0.0'><mirrors><mirror><id>secure-central</id><url>https://repo.maven.apache.org/maven2</url><mirrorOf>central</mirrorOf></mirror></mirrors></settings>" > $HOME/settings-custom.xml
+ script: mvn --settings $HOME/settings-custom.xml clean verify -DskipITs