Return-Path: 
 <commits-return-14091-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 53E2E102D0
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 18 Dec 2014 20:54:08 +0000 (UTC)
Received: (qmail 70665 invoked by uid 500); 18 Dec 2014 20:54:07 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 70580 invoked by uid 500); 18 Dec 2014 20:54:07 -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 70126 invoked by uid 99); 18 Dec 2014 20:54:07 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Dec 2014 20:54:07 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7FB4A9CA299; Thu, 18 Dec 2014 20:54:07 +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: Thu, 18 Dec 2014 20:54:20 -0000
Message-Id: <2a685a4354ec48cc818436a463942aa3@git.apache.org>
In-Reply-To: <cdffa811a1a1431aadeca450fd05ceeb@git.apache.org>
References: <cdffa811a1a1431aadeca450fd05ceeb@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [14/16] accumulo git commit: Merge branch '1.5' into 1.6

Merge branch '1.5' into 1.6

Conflicts:
	core/src/main/scripts/generate-thrift.sh
	pom.xml


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

Branch: refs/heads/master
Commit: 8f852e2efcd93304105eb15915c8f50d7fb5f49f
Parents: 52a6e97 1f8b668
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Thu Dec 18 15:50:35 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Dec 18 15:50:35 2014 -0500

----------------------------------------------------------------------
 pom.xml                                                           | 2 +-
 .../java/org/apache/accumulo/test/stress/random/package-info.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f852e2e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 0d3323f,8316a33..ec55ebe
--- a/pom.xml
+++ b/pom.xml
@@@ -609,12 -484,12 +609,12 @@@
            <!-- Work around MRELEASE-812 -->
            <version>2.5</version>
            <configuration>
-             <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2</arguments>
 -            <arguments>-Dmavanagaiata.dirtyFlag=false -P apache-release,check-licenses,thrift,native,assemble,docs,rpm,deb</arguments>
++            <arguments>-P apache-release,thrift,assemble,docs,sunny -Dtimeout.factor=2 -Dmavanagaiata.dirtyFlag=false</arguments>
              <autoVersionSubmodules>true</autoVersionSubmodules>
 -            <goals>clean compile javadoc:aggregate deploy</goals>
 -            <preparationGoals>clean compile javadoc:aggregate verify</preparationGoals>
 +            <goals>clean deploy</goals>
 +            <preparationGoals>clean verify</preparationGoals>
              <tagNameFormat>@{project.version}</tagNameFormat>
 -            <releaseProfiles>seal-jars</releaseProfiles>
 +            <releaseProfiles>seal-jars,skip-findbugs</releaseProfiles>
              <useReleaseProfile>false</useReleaseProfile>
              <pushChanges>false</pushChanges>
              <localCheckout>true</localCheckout>