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 3EA7B183CE for ; Fri, 30 Oct 2015 23:32:36 +0000 (UTC) Received: (qmail 18797 invoked by uid 500); 30 Oct 2015 23:32:36 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 18722 invoked by uid 500); 30 Oct 2015 23:32:36 -0000 Mailing-List: contact commits-help@usergrid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.apache.org Delivered-To: mailing list commits@usergrid.apache.org Received: (qmail 18705 invoked by uid 99); 30 Oct 2015 23:32:36 -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, 30 Oct 2015 23:32:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D0DC7E07EE; Fri, 30 Oct 2015 23:32:35 +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: Fri, 30 Oct 2015 23:32:39 -0000 Message-Id: <5ef0cacb7a7143a29dd5adedcf2dc4e8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/50] [abbrv] usergrid git commit: Merge branch 'USERGRID-1052' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1052 Merge branch 'USERGRID-1052' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1052 Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/48161a1a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/48161a1a Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/48161a1a Branch: refs/heads/master Commit: 48161a1ac9bfbf3e8c3aefa9586fc104ff0ec664 Parents: b1e1ed1 1b83a86 Author: Todd Nine Authored: Thu Oct 22 12:13:08 2015 -0600 Committer: Todd Nine Committed: Thu Oct 22 12:13:08 2015 -0600 ---------------------------------------------------------------------- .../org/apache/usergrid/rest/applications/ApplicationResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------