usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [07/50] [abbrv] git commit: Merge 6595f919321c721d01e116a45d016e786d565fee into c7b8612759f37da299b271b5c08de2a3fa4d71c6
Date Mon, 07 Jul 2014 18:16:24 GMT
Merge 6595f919321c721d01e116a45d016e786d565fee into c7b8612759f37da299b271b5c08de2a3fa4d71c6


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7e318fa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7e318fa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7e318fa6

Branch: refs/pull/198/merge
Commit: 7e318fa60c11ca01de49902860e7f94d6f382c3a
Parents: c7b8612 6595f91
Author: Strong Liu <stliu@hibernate.org>
Authored: Fri Jun 27 14:17:23 2014 +0000
Committer: Strong Liu <stliu@hibernate.org>
Committed: Fri Jun 27 14:17:23 2014 +0000

----------------------------------------------------------------------
 .../main/resources/usergrid-default.properties  |   2 +-
 .../persistence/entities/Application.java       |  27 ++---
 .../main/resources/usergrid-core-context.xml    |   9 +-
 .../resources/usergrid-scheduler-context.xml    |  49 --------
 .../rest/applications/users/UsersResource.java  |  17 ++-
 .../applications/ApplicationsResource.java      |   3 +-
 .../usergrid/management/ManagementService.java  |   1 +
 .../cassandra/ManagementServiceImpl.java        | 116 ++++++++++---------
 .../exceptions/MissingEmailException.java       |  48 ++++++++
 .../usergrid/security/tokens/TokenCategory.java |   8 +-
 .../tokens/cassandra/TokenServiceImpl.java      |  23 +++-
 .../apache/usergrid/services/ServiceInfo.java   |   4 +-
 12 files changed, 175 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/7e318fa6/stack/config/src/main/resources/usergrid-default.properties
----------------------------------------------------------------------


Mime
View raw message