From commits-return-16847-apmail-usergrid-commits-archive=usergrid.apache.org@usergrid.apache.org Wed Oct 14 21:50:18 2015 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 724C918C0B for ; Wed, 14 Oct 2015 21:50:17 +0000 (UTC) Received: (qmail 55669 invoked by uid 500); 14 Oct 2015 21:50:17 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 55602 invoked by uid 500); 14 Oct 2015 21:50:17 -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 55519 invoked by uid 99); 14 Oct 2015 21:50:17 -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; Wed, 14 Oct 2015 21:50:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DED23E0C61; Wed, 14 Oct 2015 21:50:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sfeldman@apache.org To: commits@usergrid.apache.org Date: Wed, 14 Oct 2015 21:50:19 -0000 Message-Id: <860ab655f7424ac58c9ef2b181dce33b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/32] usergrid git commit: Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8ea74b05 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8ea74b05 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8ea74b05 Branch: refs/heads/master Commit: 8ea74b05856f22c7b7cfccb03ebc98fe8fed83b1 Parents: 7cc32c3 f3d5fb5 Author: Todd Nine Authored: Thu Oct 1 15:58:50 2015 -0600 Committer: Todd Nine Committed: Thu Oct 1 15:58:50 2015 -0600 ---------------------------------------------------------------------- stack/rest_integration_tests/lib/entities.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------