Merge branch 'master' into feature-flags
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/f38b131a Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/f38b131a Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/f38b131a Branch: refs/heads/feature-flags Commit: f38b131a0dc50a81b41fb19067ef976638ac20cb Parents: 5b42c0a d090154 Author: Michael Russo <[email protected]> Authored: Tue Sep 6 18:55:39 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Tue Sep 6 18:55:39 2016 -0700 ---------------------------------------------------------------------- .../management/cassandra/ManagementServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/f38b131a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ----------------------------------------------------------------------
