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/98f95f90 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/98f95f90 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/98f95f90 Branch: refs/heads/apigee-sso-provider Commit: 98f95f901e488ce6d5affceaaa13fce5e141a24d Parents: 50eee86 1e11464 Author: Michael Russo <mru...@apigee.com> Authored: Thu Jul 28 09:59:29 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Thu Jul 28 09:59:29 2016 -0700 ---------------------------------------------------------------------- .../usergrid/java/client/query/UsergridQuery.java | 6 ++++-- .../usergrid/query/validator/ApiServerRunner.java | 18 +++--------------- 2 files changed, 7 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
