From commits-return-21536-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org  Tue Feb 27 06:29:40 2018
Return-Path: <commits-return-21536-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 6E12B180671
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 27 Feb 2018 06:29:40 +0100 (CET)
Received: (qmail 13779 invoked by uid 500); 27 Feb 2018 05:29:39 -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 13663 invoked by uid 99); 27 Feb 2018 05:29:38 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Feb 2018 05:29:38 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 91CBE8502A; Tue, 27 Feb 2018 05:29:37 +0000 (UTC)
Date: Tue, 27 Feb 2018 05:29:40 +0000
To: "commits@accumulo.apache.org" <commits@accumulo.apache.org>
Subject: [accumulo] 03/04: Merge branch '1.7' into 1.8
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: ctubbsii@apache.org
In-Reply-To: <151970937744.6687.13373301868555616195@gitbox.apache.org>
References: <151970937744.6687.13373301868555616195@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: accumulo
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: f0684b2e31ae202b2bb9e98b80c9db8d3f979ff2
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20180227052937.91CBE8502A@gitbox.apache.org>

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit f0684b2e31ae202b2bb9e98b80c9db8d3f979ff2
Merge: fc75402 08e7dfa
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Mon Feb 26 23:11:37 2018 -0500

    Merge branch '1.7' into 1.8

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

diff --cc pom.xml
index b8d2e6b,6491202..44273de
--- a/pom.xml
+++ b/pom.xml
@@@ -374,19 -356,9 +374,19 @@@
        <dependency>
          <groupId>org.apache.commons</groupId>
          <artifactId>commons-vfs2</artifactId>
-         <version>2.1</version>
+         <version>2.2</version>
        </dependency>
        <dependency>
 +        <groupId>org.apache.curator</groupId>
 +        <artifactId>curator-framework</artifactId>
 +        <version>${curator.version}</version>
 +      </dependency>
 +      <dependency>
 +        <groupId>org.apache.curator</groupId>
 +        <artifactId>curator-test</artifactId>
 +        <version>${curator.version}</version>
 +      </dependency>
 +      <dependency>
          <groupId>org.apache.hadoop</groupId>
          <artifactId>hadoop-client</artifactId>
          <version>${hadoop.version}</version>

-- 
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.