Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CD026200B7E for ; Mon, 1 Aug 2016 18:53:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CBCAB160A6C; Mon, 1 Aug 2016 16:53:40 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2C6A8160ACC for ; Mon, 1 Aug 2016 18:53:39 +0200 (CEST) Received: (qmail 97740 invoked by uid 500); 1 Aug 2016 16:53:38 -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 96725 invoked by uid 99); 1 Aug 2016 16:53:37 -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; Mon, 01 Aug 2016 16:53:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A594FE0B40; Mon, 1 Aug 2016 16:53:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mrusso@apache.org To: commits@usergrid.apache.org Date: Mon, 01 Aug 2016 16:54:15 -0000 Message-Id: In-Reply-To: <5bb816fa9ec14f87a7a46cab47f2ff30@git.apache.org> References: <5bb816fa9ec14f87a7a46cab47f2ff30@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] usergrid git commit: Merge branch 'master' into apigee-sso-provider archived-at: Mon, 01 Aug 2016 16:53:41 -0000 Merge branch 'master' into apigee-sso-provider Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/50eee863 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/50eee863 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/50eee863 Branch: refs/heads/master Commit: 50eee86310261612a9bcb6ada748a281094bddca Parents: ddde8dd 055289a Author: Michael Russo Authored: Wed Jul 27 16:52:51 2016 -0700 Committer: Michael Russo Committed: Wed Jul 27 16:52:51 2016 -0700 ---------------------------------------------------------------------- .../apache/usergrid/java/client/UsergridClient.java | 2 ++ .../java/client/UsergridRequestManager.java | 13 ++++++++++++- .../usergrid/java/client/auth/UsergridAuth.java | 1 + .../usergrid/java/client/auth/UsergridUserAuth.java | 16 ++++++++++++++-- .../usergrid/java/client/query/UsergridQuery.java | 5 ----- .../usergrid/query/validator/ApiServerRunner.java | 2 +- 6 files changed, 30 insertions(+), 9 deletions(-) ----------------------------------------------------------------------