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 03:21:19 UTC
[27/27] git commit: Merge db226fde292d2f0ba8b4864fdbe6e66dde26746e
into ec3f5b1c142bca41bedc6d17380cbaf0429406f4
Merge db226fde292d2f0ba8b4864fdbe6e66dde26746e into ec3f5b1c142bca41bedc6d17380cbaf0429406f4
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0b74bfc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0b74bfc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0b74bfc0
Branch: refs/pull/92/merge
Commit: 0b74bfc08d2bf66afe4cc53258bb506b19e486d5
Parents: ec3f5b1 db226fd
Author: GERey <gr...@apigee.com>
Authored: Tue Apr 1 00:26:16 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Tue Apr 1 00:26:16 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(-)
----------------------------------------------------------------------