Return-Path: 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 3B395176A4 for ; Fri, 8 May 2015 00:03:08 +0000 (UTC) Received: (qmail 956 invoked by uid 500); 8 May 2015 00:03:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 874 invoked by uid 500); 8 May 2015 00:03:08 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 759 invoked by uid 99); 8 May 2015 00:03:08 -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; Fri, 08 May 2015 00:03:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E3DF6E443E; Fri, 8 May 2015 00:03: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: Fri, 08 May 2015 00:03:13 -0000 Message-Id: <6ff249c720d34fab94ecb535cdea0ac5@git.apache.org> In-Reply-To: <41a2017533a24354a51e08ad7fb22a1f@git.apache.org> References: <41a2017533a24354a51e08ad7fb22a1f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] accumulo git commit: Merge branch '1.7' Merge branch '1.7' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6739a20 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6739a20 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6739a20 Branch: refs/heads/master Commit: b6739a200694a419ef3baeac7ec1e448153d5fcd Parents: 68b8cd7 61eea42 Author: Christopher Tubbs Authored: Thu May 7 19:54:16 2015 -0400 Committer: Christopher Tubbs Committed: Thu May 7 19:54:16 2015 -0400 ---------------------------------------------------------------------- assemble/pom.xml | 1 + examples/simple/pom.xml | 9 ---- maven-plugin/pom.xml | 3 ++ maven-plugin/src/it/plugin-test/pom.xml | 7 --- pom.xml | 72 +++++++++++----------------- server/base/pom.xml | 9 ---- server/gc/pom.xml | 11 ----- server/master/pom.xml | 11 ----- server/monitor/pom.xml | 9 ---- server/native/pom.xml | 8 +--- server/tracer/pom.xml | 11 ----- server/tserver/pom.xml | 9 ---- 12 files changed, 34 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/maven-plugin/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/gc/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/master/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/native/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tracer/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6739a20/server/tserver/pom.xml ----------------------------------------------------------------------