Return-Path: 
 <commits-return-15961-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 DF7F617B3C
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Wed, 10 Jun 2015 00:19:56 +0000 (UTC)
Received: (qmail 24276 invoked by uid 500); 10 Jun 2015 00:19:56 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 24225 invoked by uid 500); 10 Jun 2015 00:19:56 -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 24198 invoked by uid 99); 10 Jun 2015 00:19:56 -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, 10 Jun 2015 00:19:56 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 6EB4BE0283; Wed, 10 Jun 2015 00:19:56 +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, 10 Jun 2015 00:20:01 -0000
Message-Id: <b855991454244b739b28c138f8e2d5f3@git.apache.org>
In-Reply-To: <4b256b5513e744fe81d5c10e108c8bd9@git.apache.org>
References: <4b256b5513e744fe81d5c10e108c8bd9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [6/6] accumulo git commit: Merge branch '1.7'

Merge branch '1.7'

Conflicts:
	pom.xml


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

Branch: refs/heads/master
Commit: f6df8991b078df1d1a58fa31995f1205941d5af2
Parents: 93f285e 50f8a79
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jun 9 20:19:20 2015 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jun 9 20:19:20 2015 -0400

----------------------------------------------------------------------
 maven-plugin/pom.xml | 80 ++++++++++++++++++++++++++---------------------
 pom.xml              |  2 +-
 2 files changed, 46 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6df8991/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 7f8da69,3477bff..5990d63
--- a/pom.xml
+++ b/pom.xml
@@@ -665,7 -654,7 +665,7 @@@
              <goals>clean deploy</goals>
              <preparationGoals>clean verify</preparationGoals>
              <tagNameFormat>@{project.version}</tagNameFormat>
-             <releaseProfiles>apache-release,accumulo-release,!test-accumulo-maven-plugin</releaseProfiles>
 -            <releaseProfiles>apache-release,move-source-tarball,seal-jars,skip-findbugs,skip-plugin-its-with-skipTests</releaseProfiles>
++            <releaseProfiles>apache-release,accumulo-release,skip-plugin-its-with-skipTests</releaseProfiles>
              <useReleaseProfile>false</useReleaseProfile>
              <pushChanges>false</pushChanges>
              <localCheckout>true</localCheckout>