Merge branch '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/80e9f37d Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/80e9f37d Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/80e9f37d Branch: refs/heads/master Commit: 80e9f37d694d3c59cd7127fb2ab4085975bd5708 Parents: e8b9ad5 7625b0d Author: Michael Russo <mru...@apigee.com> Authored: Fri Aug 19 11:19:52 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Fri Aug 19 11:19:52 2016 -0700 ---------------------------------------------------------------------- .../apache/usergrid/corepersistence/GuiceFactory.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/80e9f37d/stack/core/src/main/java/org/apache/usergrid/corepersistence/GuiceFactory.java ----------------------------------------------------------------------
