Merge branch 'EsTimeout' of https://github.com/apache/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/472ccaf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/472ccaf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/472ccaf2 Branch: refs/heads/two-dot-o-dev Commit: 472ccaf2523799c51a57e324776172f57ee55ce2 Parents: 527ac86 74f6684 Author: GERey <gre...@apigee.com> Authored: Mon Apr 20 09:27:21 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Mon Apr 20 09:27:21 2015 -0700 ---------------------------------------------------------------------- .../usergrid/persistence/index/IndexFig.java | 17 +++++++++++++++++ .../index/impl/EsEntityIndexImpl.java | 20 +++----------------- .../index/impl/EsIndexBufferConsumerImpl.java | 2 +- 3 files changed, 21 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
