Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A582B1747E for ; Tue, 4 Nov 2014 22:59:24 +0000 (UTC) Received: (qmail 14792 invoked by uid 500); 4 Nov 2014 22:59:24 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 14740 invoked by uid 500); 4 Nov 2014 22:59:24 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 14492 invoked by uid 99); 4 Nov 2014 22:59:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 22:59:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1C07A93269A; Tue, 4 Nov 2014 22:59:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: toddnine@apache.org To: commits@usergrid.apache.org Date: Tue, 04 Nov 2014 22:59:34 -0000 Message-Id: <7bea19243d034b26b58061d567f33f25@git.apache.org> In-Reply-To: <2135bf186ed849ab83b0bfa2668055b6@git.apache.org> References: <2135bf186ed849ab83b0bfa2668055b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/14] git commit: Merge remote-tracking branch 'ryan/APIBAAS-1362' into ryan-integration Merge remote-tracking branch 'ryan/APIBAAS-1362' into ryan-integration Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/179bc18f Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/179bc18f Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/179bc18f Branch: refs/heads/key-row-sharding Commit: 179bc18f36ce7fd59ed615af9fba2993589880f0 Parents: 5fdbfa0 604d4f9 Author: Todd Nine Authored: Tue Nov 4 15:47:12 2014 -0700 Committer: Todd Nine Committed: Tue Nov 4 15:47:12 2014 -0700 ---------------------------------------------------------------------- stack/awscluster/assembly.xml | 8 ++-- stack/awscluster/pom.xml | 66 +++++++++++++++++++-------- stack/awscluster/src/main/dist/update.sh | 16 +++---- stack/awscluster/ugcluster-cf.json | 24 ++++++---- stack/pom.xml | 10 ++-- 5 files changed, 79 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/awscluster/ugcluster-cf.json ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/179bc18f/stack/pom.xml ----------------------------------------------------------------------