From commits-return-24111-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org  Thu Sep  3 02:32:40 2020
Return-Path: <commits-return-24111-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 mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153])
	by minotaur.apache.org (Postfix) with ESMTP id 05C00194D9
	for <apmail-accumulo-commits-archive@www.apache.org>; Thu,  3 Sep 2020 02:32:40 +0000 (UTC)
Received: from mail.apache.org (localhost [127.0.0.1])
	by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 97341121BC6
	for <apmail-accumulo-commits-archive@www.apache.org>; Thu,  3 Sep 2020 02:32:39 +0000 (UTC)
Received: (qmail 68337 invoked by uid 500); 3 Sep 2020 02:32:39 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 68254 invoked by uid 500); 3 Sep 2020 02:32: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 68218 invoked by uid 99); 3 Sep 2020 02:32:39 -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; Thu, 03 Sep 2020 02:32:39 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 99A218087C; Thu,  3 Sep 2020 02:32:38 +0000 (UTC)
Date: Thu, 03 Sep 2020 02:32:41 +0000
To: "commits@accumulo.apache.org" <commits@accumulo.apache.org>
Subject: [accumulo] 01/01: Merge branch '1.10' into main
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: ctubbsii@apache.org
In-Reply-To: <159910035805.7121.14650047340799808810@gitbox.apache.org>
References: <159910035805.7121.14650047340799808810@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: accumulo
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Rev: 90b9cacb5bd5b6dc15c7000475e10e55007094a5
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20200903023238.99A218087C@gitbox.apache.org>

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

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

commit 90b9cacb5bd5b6dc15c7000475e10e55007094a5
Merge: c997ab7 8ff6765
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Wed Sep 2 22:30:12 2020 -0400

    Merge branch '1.10' into main

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

diff --cc pom.xml
index 371e8e8,dd8397e..83880e3
--- a/pom.xml
+++ b/pom.xml
@@@ -143,10 -143,10 +143,10 @@@
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
      <powermock.version>2.0.7</powermock.version>
      <!-- timestamp for reproducible outputs, updated on release by the release plugin -->
-     <project.build.outputTimestamp>2020-08-18T00:00:00Z</project.build.outputTimestamp>
+     <project.build.outputTimestamp>2020-08-27T15:56:15Z</project.build.outputTimestamp>
      <!-- surefire/failsafe plugin option -->
      <reuseForks>false</reuseForks>
 -    <slf4j.version>1.7.25</slf4j.version>
 +    <slf4j.version>1.7.30</slf4j.version>
      <sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
      <surefire.excludedGroups />
      <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>