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 <mru...@apigee.com> Authored: Wed Jul 27 16:52:51 2016 -0700 Committer: Michael Russo <mru...@apigee.com> 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(-) ----------------------------------------------------------------------