Merge branch 'USERGRID-1052' of https://git-wip-us.apache.org/repos/asf/usergrid into USERGRID-1052
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/10d0a070 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/10d0a070 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/10d0a070 Branch: refs/heads/2.1-release Commit: 10d0a070758c2f1e499ff43c6efab866f8469d1e Parents: beaed6f 5b01fc9 Author: Todd Nine <tn...@apigee.com> Authored: Wed Oct 21 18:19:48 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Wed Oct 21 18:19:48 2015 -0600 ---------------------------------------------------------------------- .../persistence/core/astyanax/CassandraFig.java | 2 +- .../index/impl/EsEntityIndexImpl.java | 45 +++++++++++++++----- .../usergrid/persistence/queue/QueueFig.java | 2 +- 3 files changed, 37 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
