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/ddde8ddd Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/ddde8ddd Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/ddde8ddd Branch: refs/heads/datastax-cass-driver Commit: ddde8dddb60e3e77e7c9ad40201c3727fc77eafc Parents: 9d78b59 4558dc9 Author: Michael Russo <[email protected]> Authored: Wed Jul 27 13:53:44 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Wed Jul 27 13:53:44 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/usergrid/query/validator/AbstractQueryIT.java | 3 ++- .../org/apache/usergrid/query/validator/users/UserQueryIT.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
