Merge commit 'refs/pull/453/head' of 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/2e89eda2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/2e89eda2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/2e89eda2 Branch: refs/heads/master Commit: 2e89eda2f1eb723ab8d77815da65b4d8d41aab45 Parents: d8787a4 abf27db Author: Michael Russo <[email protected]> Authored: Thu Jan 7 14:22:53 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Thu Jan 7 14:22:53 2016 -0800 ---------------------------------------------------------------------- .../rest/management/organizations/users/UsersResource.java | 2 +- .../org/apache/usergrid/rest/management/users/UsersResource.java | 2 +- .../management/users/organizations/OrganizationsResource.java | 4 ++-- .../org/apache/usergrid/rest/system/ApplicationsResource.java | 4 ++-- .../main/java/org/apache/usergrid/rest/system/IndexResource.java | 2 +- .../java/org/apache/usergrid/rest/system/MigrateResource.java | 2 +- .../java/org/apache/usergrid/rest/test/RefreshIndexResource.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2e89eda2/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/2e89eda2/stack/rest/src/main/java/org/apache/usergrid/rest/system/MigrateResource.java ----------------------------------------------------------------------
