You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/01 21:22:10 UTC
[56/57] [abbrv] git commit: Merge
db226fde292d2f0ba8b4864fdbe6e66dde26746e into
fb0aab04443fcfd10f8c8d01315d525cb6fac275
Merge db226fde292d2f0ba8b4864fdbe6e66dde26746e into fb0aab04443fcfd10f8c8d01315d525cb6fac275
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/87fd0b15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/87fd0b15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/87fd0b15
Branch: refs/pull/92/merge
Commit: 87fd0b1530be61be999a8514323021c2426d965e
Parents: fb0aab0 db226fd
Author: GERey <gr...@apigee.com>
Authored: Tue Apr 1 18:28:04 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Tue Apr 1 18:28:04 2014 +0000
----------------------------------------------------------------------
.../organizations/OrganizationResource.java | 81 +++
.../applications/ApplicationResource.java | 2 +-
.../rest/management/ManagementResourceIT.java | 461 +++++++++++-------
.../management/export/ExportService.java | 2 +
.../management/export/ExportServiceImpl.java | 217 ++++++++-
.../cassandra/ManagementServiceIT.java | 488 ++++++++++++++-----
.../security/tokens/TokenServiceIT.java | 3 +-
7 files changed, 938 insertions(+), 316 deletions(-)
----------------------------------------------------------------------