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 985B110E90 for ; Wed, 18 Sep 2013 00:47:55 +0000 (UTC) Received: (qmail 21891 invoked by uid 500); 18 Sep 2013 00:47:55 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 21837 invoked by uid 500); 18 Sep 2013 00:47:55 -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 21824 invoked by uid 99); 18 Sep 2013 00:47:55 -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:47:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47EA4AD15; Wed, 18 Sep 2013 00:47:55 +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:47:56 -0000 Message-Id: <571c79f0871047909cf781aa91b28017@git.apache.org> In-Reply-To: <6ac779e1b0394f50be7efbfb105eb882@git.apache.org> References: <6ac779e1b0394f50be7efbfb105eb882@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: ACCUMULO-1166 Merge branch '1.4' into 1.5 ACCUMULO-1166 Merge branch '1.4' into 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/0c77dae9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/tree/0c77dae9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-instamo-archetype/diff/0c77dae9 Branch: refs/heads/1.5 Commit: 0c77dae9020a798eabd3748ce44685be4fc3ebfd Parents: 1e6f9d4 50e8047 Author: Josh Elser Authored: Tue Sep 17 20:47:15 2013 -0400 Committer: Josh Elser Committed: Tue Sep 17 20:47:15 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/0c77dae9/pom.xml ----------------------------------------------------------------------