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 4857110E92 for ; Wed, 18 Sep 2013 00:48:17 +0000 (UTC) Received: (qmail 22204 invoked by uid 500); 18 Sep 2013 00:48:17 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 22151 invoked by uid 500); 18 Sep 2013 00:48:17 -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 22076 invoked by uid 99); 18 Sep 2013 00:48:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 00:48:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EE686AD33; Wed, 18 Sep 2013 00:48:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Wed, 18 Sep 2013 00:48:18 -0000 Message-Id: <191462fabc9a46078de44f1b32fc5ecc@git.apache.org> In-Reply-To: <4c9a1311060c46e998607b387a3e287a@git.apache.org> References: <4c9a1311060c46e998607b387a3e287a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: ACCUMULO-1166 Merge branch '1.5' ACCUMULO-1166 Merge branch '1.5' Project: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/commit/e0c0b241 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/e0c0b241 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/e0c0b241 Branch: refs/heads/master Commit: e0c0b241f966e2116c1d941041b01807201fbea8 Parents: 07f7059 0c77dae Author: Josh Elser Authored: Tue Sep 17 20:48:00 2013 -0400 Committer: Josh Elser Committed: Tue Sep 17 20:48:00 2013 -0400 ---------------------------------------------------------------------- README.md | 17 +++++++++++++++++ pom.xml | 19 +++++++++++++++++++ src/main/resources/archetype-resources/README.md | 17 +++++++++++++++++ 3 files changed, 53 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/blob/e0c0b241/pom.xml ----------------------------------------------------------------------