Merge branch 'two-dot-o' into USERGRID-480
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/89f2c2f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/89f2c2f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/89f2c2f1 Branch: refs/heads/USERGRID-347 Commit: 89f2c2f1f5b9cc864bfe047a6813dd15dae01483 Parents: 947f063 eb0c689 Author: Shawn Feldman <[email protected]> Authored: Wed Mar 18 15:54:17 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Wed Mar 18 15:54:17 2015 -0600 ---------------------------------------------------------------------- .../index/impl/EsEntityIndexImpl.java | 83 +++++++++----------- 1 file changed, 35 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/89f2c2f1/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java ----------------------------------------------------------------------
