Merge commit 'refs/pull/580/head' of github.com:apache/usergrid into debug_logging
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/9b04ae71 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/9b04ae71 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/9b04ae71 Branch: refs/heads/debug_logging Commit: 9b04ae714f5ef1e1906b6f50657b9d8b4fce5a64 Parents: 1cf67fa 3ad5b10 Author: Mike Dunker <mdun...@google.com> Authored: Wed Oct 18 14:10:46 2017 -0700 Committer: Mike Dunker <mdun...@google.com> Committed: Wed Oct 18 14:10:46 2017 -0700 ---------------------------------------------------------------------- .../index/impl/EsEntityIndexImpl.java | 30 ++++++++++++++++---- .../persistence/index/impl/EsProvider.java | 3 +- 2 files changed, 27 insertions(+), 6 deletions(-) ----------------------------------------------------------------------