Merge branch 'release-2.1.1' into usergrid-221-queryvalidator
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d7bb25ac Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d7bb25ac Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d7bb25ac Branch: refs/heads/apigee-sso-provider Commit: d7bb25ac4b52ae08aa3320eec815e5e532de7703 Parents: 7738ee0 5dc3324 Author: Dave Johnson <snoopd...@apache.org> Authored: Wed Jul 20 10:10:39 2016 -0400 Committer: Dave Johnson <snoopd...@apache.org> Committed: Wed Jul 20 10:10:39 2016 -0400 ---------------------------------------------------------------------- .../index/impl/EsEntityIndexImpl.java | 53 +++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) ----------------------------------------------------------------------