Merge branch '2.1-release' of https://git-wip-us.apache.org/repos/asf/usergrid into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/67c0bfa1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/67c0bfa1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/67c0bfa1 Branch: refs/heads/2.1-release Commit: 67c0bfa103e3ee37218d8ace70ae6a6f14b530a7 Parents: 6b58d3e 3f4d33a Author: Mike Dunker <mdun...@apigee.com> Authored: Fri Nov 6 12:29:19 2015 -0800 Committer: Mike Dunker <mdun...@apigee.com> Committed: Fri Nov 6 12:29:19 2015 -0800 ---------------------------------------------------------------------- .../impl/shard/impl/ShardGroupDeletionImpl.java | 165 ++++++++++--------- .../shard/impl/ShardGroupDeletionImplTest.java | 2 + 2 files changed, 86 insertions(+), 81 deletions(-) ----------------------------------------------------------------------