Merge commit 'refs/pull/495/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/74b21132 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/74b21132 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/74b21132 Branch: refs/heads/release-2.1.1 Commit: 74b2113200b2b52b60fdef1a45d861f6cea73776 Parents: ac3e63a 25e9a8f Author: Michael Russo <[email protected]> Authored: Tue Mar 29 12:48:39 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Mar 29 12:48:39 2016 -0700 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 + .../usergrid/persistence/index/IndexFig.java | 2 +- .../cassandra/ManagementServiceImpl.java | 67 ++++++++++++++------ 3 files changed, 52 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
