Merge commit 'refs/pull/460/head' of apache.github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/95fa5209 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/95fa5209 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/95fa5209 Branch: refs/heads/master Commit: 95fa52099b9f0e993c2f5daa59bb556384da4c31 Parents: ce31acd 27e2992 Author: Mike Dunker <mdun...@apigee.com> Authored: Mon Jan 11 00:32:11 2016 -0800 Committer: Mike Dunker <mdun...@apigee.com> Committed: Mon Jan 11 00:32:11 2016 -0800 ---------------------------------------------------------------------- .../cassandra/ManagementServiceImpl.java | 27 ++++++++++++-------- .../migration/AppInfoMigrationPluginTest.java | 2 +- 2 files changed, 18 insertions(+), 11 deletions(-) ----------------------------------------------------------------------