Merge commit 'refs/pull/414/head' of github.com:apache/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/e018c1e0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/e018c1e0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/e018c1e0 Branch: refs/heads/USERGRID-909 Commit: e018c1e0d65e3af339e36c69a4e59fe2d2a83167 Parents: 2aec8a0 7a4f36a Author: Michael Russo <michaelaru...@gmail.com> Authored: Tue Oct 27 10:54:04 2015 -0700 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Tue Oct 27 10:54:04 2015 -0700 ---------------------------------------------------------------------- .../service/StatusServiceImpl.java | 3 +- .../usergrid/rest/ApplicationsResource.java | 178 ---------- .../apache/usergrid/rest/DatabaseResource.java | 98 ------ .../org/apache/usergrid/rest/IndexResource.java | 328 ------------------ .../apache/usergrid/rest/MigrateResource.java | 268 --------------- .../apache/usergrid/rest/SystemResource.java | 103 ------ .../rest/system/ApplicationsResource.java | 178 ++++++++++ .../rest/system/ConnectionResource.java | 202 +++++++++++ .../usergrid/rest/system/DatabaseResource.java | 100 ++++++ .../usergrid/rest/system/IndexResource.java | 331 +++++++++++++++++++ .../usergrid/rest/system/MigrateResource.java | 270 +++++++++++++++ .../usergrid/rest/system/SystemResource.java | 108 ++++++ 12 files changed, 1191 insertions(+), 976 deletions(-) ----------------------------------------------------------------------