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/03/21 15:21:27 UTC

[36/38] git commit: Merge 1f71604016d0c04d99e820015b5818e64f2fc735 into 3f93ca70776988a4da4f276fc796431960677432

Merge 1f71604016d0c04d99e820015b5818e64f2fc735 into 3f93ca70776988a4da4f276fc796431960677432


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

Branch: refs/pull/76/merge
Commit: 7d1eb62c42b092a131cef594aa3aa5052eb1924f
Parents: 3f93ca7 1f71604
Author: GERey <gr...@apigee.com>
Authored: Fri Mar 21 13:44:12 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Fri Mar 21 13:44:12 2014 +0000

----------------------------------------------------------------------
 .../applications/ApplicationResource.java       |   1 -
 stack/services/pom.xml                          |   6 +-
 .../management/export/ExportServiceImpl.java    |  59 +---
 .../management/export/S3ExportImpl.java         |  10 +-
 .../cassandra/ManagementServiceIT.java          | 291 +++++++++++++++++--
 .../management/cassandra/MockS3ExportImpl.java  |   1 -
 6 files changed, 281 insertions(+), 87 deletions(-)
----------------------------------------------------------------------