Return-Path: 
 <commits-return-17390-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 1CCAD182EE
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed,  3 Feb 2016 21:56:55 +0000 (UTC)
Received: (qmail 7968 invoked by uid 500); 3 Feb 2016 21:56:33 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 7894 invoked by uid 500); 3 Feb 2016 21:56:33 -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 7689 invoked by uid 99); 3 Feb 2016 21:56: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; Wed, 03 Feb 2016 21:56:33 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 03B15E0E06; Wed,  3 Feb 2016 21:56: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: Wed, 03 Feb 2016 21:56:35 -0000
Message-Id: <0deb99146acd4ed9ac732eeb26e013a6@git.apache.org>
In-Reply-To: <9333caebd00a4cb0b819d4e552697e1c@git.apache.org>
References: <9333caebd00a4cb0b819d4e552697e1c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/6] accumulo git commit: Merge branch '1.6' into 1.7

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

Branch: refs/heads/master
Commit: 81f1c7d8047dd7eb5c6f7f1dd4dd12fcbb1ecf72
Parents: 301d91b 95f5aff
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Feb 3 16:51:22 2016 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Feb 3 16:51:22 2016 -0500

----------------------------------------------------------------------
 maven-plugin/pom.xml                    | 3 ++-
 maven-plugin/src/it/plugin-test/pom.xml | 7 +++++++
 pom.xml                                 | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/81f1c7d8/maven-plugin/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/81f1c7d8/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7138c2f,663a79d..940478d
--- a/pom.xml
+++ b/pom.xml
@@@ -794,9 -742,14 +794,9 @@@
            </executions>
          </plugin>
          <plugin>
 -          <groupId>org.apache.maven.plugins</groupId>
 -          <artifactId>maven-plugin-plugin</artifactId>
 -          <version>3.4</version>
 -        </plugin>
 -        <plugin>
            <groupId>org.apache.rat</groupId>
            <artifactId>apache-rat-plugin</artifactId>
-           <version>0.10</version>
+           <version>0.11</version>
            <configuration>
              <excludes>
                <exclude>nbproject/**</exclude>