Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/usergrid into release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4e048f32 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4e048f32 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4e048f32 Branch: refs/heads/master Commit: 4e048f32af6365eb168075d351b0ccd9325d31bf Parents: b22ac65 38b6b88 Author: Dave Johnson <[email protected]> Authored: Fri Jan 15 15:13:25 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Jan 15 15:13:25 2016 -0500 ---------------------------------------------------------------------- .../cassandra/ManagementServiceImpl.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
