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 2015/02/10 23:02:34 UTC
[1/2] incubator-usergrid git commit: No need for em.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-import 65e6feeb1 -> 843d9faf7
No need for em.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c7c1ac3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c7c1ac3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c7c1ac3b
Branch: refs/heads/two-dot-o-import
Commit: c7c1ac3b966b16f723b29e7fc27d88046aa42742
Parents: c3839c8
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 10 17:02:12 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 10 17:02:12 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/usergrid/rest/JobServiceBoostrap.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c7c1ac3b/stack/rest/src/main/java/org/apache/usergrid/rest/JobServiceBoostrap.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/JobServiceBoostrap.java b/stack/rest/src/main/java/org/apache/usergrid/rest/JobServiceBoostrap.java
index 7053c6c..f337659 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/JobServiceBoostrap.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/JobServiceBoostrap.java
@@ -45,9 +45,6 @@ public class JobServiceBoostrap implements
@Autowired
private Properties properties;
- @Autowired
- EntityManager em;
-
public JobServiceBoostrap() {
}
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-import'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Posted by sn...@apache.org.
Merge branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/843d9faf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/843d9faf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/843d9faf
Branch: refs/heads/two-dot-o-import
Commit: 843d9faf706e9130ea87709bbcb401088c8f7f70
Parents: c7c1ac3 65e6fee
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Feb 10 17:02:22 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Feb 10 17:02:22 2015 -0500
----------------------------------------------------------------------
.../rest/management/ImportResourceIT.java | 402 +++++++++++++++++++
.../resources/testImport.testApplication.2.json | 56 +++
.../resources/testImport.testCollection.1.json | 13 +
...testImportInvalidJson.testApplication.3.json | 139 +++++++
.../management/importer/ImportCollectionIT.java | 70 +++-
.../usergrid/management/importer/S3Upload.java | 97 +++++
.../resources/testImport.testApplication.2.json | 56 +++
.../resources/testImport.testCollection.1.json | 13 +
...testImportInvalidJson.testApplication.3.json | 139 +++++++
9 files changed, 981 insertions(+), 4 deletions(-)
----------------------------------------------------------------------