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/9d78b59b Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9d78b59b Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9d78b59b Branch: refs/heads/apigee-sso-provider Commit: 9d78b59bf613d1c2951a089e00495859954228b7 Parents: d6941b7 acd8719 Author: Michael Russo <[email protected]> Authored: Tue Jul 26 14:58:25 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Jul 26 14:58:25 2016 -0700 ---------------------------------------------------------------------- .../java/client/model/UsergridEntity.java | 2 +- stack/query-validator/pom.xml | 4 +- .../query/validator/ApiServerRunner.java | 89 +++++++------------- 3 files changed, 33 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
