You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/12 23:25:48 UTC
[9/9] incubator-usergrid git commit: Merge branch 'USERGRID-744' into
two-dot-o-dev
Merge branch 'USERGRID-744' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0620c686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0620c686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0620c686
Branch: refs/heads/two-dot-o-dev
Commit: 0620c686f27119f8ae93b425fb0384cf77f392ac
Parents: 3d2898a d1abbff
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 15:12:55 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 15:12:55 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManagerFactory.java | 73 ++++-----
.../rest/applications/ApplicationResource.java | 93 +++---------
...ationApplicationNotFoundExceptionMapper.java | 2 +-
.../applications/ApplicationResource.java | 83 +++++++++--
.../applications/ApplicationsResource.java | 13 --
.../rest/applications/ApplicationCreateIT.java | 8 +-
.../rest/applications/ApplicationDeleteIT.java | 149 +++++++++++--------
.../applications/ApplicationResourceIT.java | 12 +-
.../usergrid/rest/management/AdminUsersIT.java | 6 +-
.../rest/management/ExportResourceIT.java | 60 ++++----
.../rest/management/ImportResourceIT.java | 38 ++---
.../rest/management/ManagementResourceIT.java | 14 +-
.../rest/management/OrganizationsIT.java | 18 +--
.../rest/management/RegistrationIT.java | 7 +-
.../organizations/AdminEmailEncodingIT.java | 3 +-
.../rest/test/resource2point0/ClientSetup.java | 7 +-
.../endpoints/mgmt/ApplicationsResource.java | 7 +
.../endpoints/mgmt/OrgResource.java | 2 +-
.../cassandra/ManagementServiceImpl.java | 6 +-
19 files changed, 308 insertions(+), 293 deletions(-)
----------------------------------------------------------------------