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/02 01:23:10 UTC

[77/77] [abbrv] git commit: Merge 6527517cece3c123c098b35e3f538206d2cbd9a9 into 348c73c858daa77ce6547327a2f9717d3e0394b2

Merge 6527517cece3c123c098b35e3f538206d2cbd9a9 into 348c73c858daa77ce6547327a2f9717d3e0394b2


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

Branch: refs/pull/92/merge
Commit: 3ee1557200b906a23c23b65da66f115050c7e081
Parents: 348c73c 6527517
Author: GERey <gr...@apigee.com>
Authored: Tue Apr 1 22:55:03 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Tue Apr 1 22:55:03 2014 +0000

----------------------------------------------------------------------
 .../usergrid/persistence/entities/Export.java   |   70 --
 .../organizations/OrganizationResource.java     |  108 ++
 .../applications/ApplicationResource.java       |   44 +-
 .../rest/management/ExportResourceIT.java       |  634 ++++++++++
 .../rest/management/ManagementResourceIT.java   |  734 ++---------
 .../management/export/ExportService.java        |    4 +-
 .../management/export/ExportServiceImpl.java    |  347 ++++--
 .../management/cassandra/ExportServiceIT.java   | 1164 ++++++++++++++++++
 .../cassandra/ManagementServiceIT.java          |  946 +-------------
 .../security/tokens/TokenServiceIT.java         |    3 +-
 10 files changed, 2301 insertions(+), 1753 deletions(-)
----------------------------------------------------------------------