Merge branch 'two-dot-o' into USERGRID-509
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/07c5de06 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/07c5de06 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/07c5de06 Branch: refs/heads/two-dot-o-dev Commit: 07c5de066f44cef1228e830bf162b128f353c456 Parents: abbdd6b 2d1c8b8 Author: Todd Nine <[email protected]> Authored: Fri Mar 27 09:46:27 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Fri Mar 27 09:46:27 2015 -0600 ---------------------------------------------------------------------- .../index/impl/EsIndexBufferConsumerImpl.java | 39 +++++++------------- 1 file changed, 14 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
