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/20 08:20:49 UTC
[1/3] git commit: Merge 1f71604016d0c04d99e820015b5818e64f2fc735 into
24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Repository: incubator-usergrid
Updated Branches:
refs/pull/76/head f94561694 -> 1f7160401
refs/pull/76/merge 555952783 -> b6ad02339 (forced update)
Merge 1f71604016d0c04d99e820015b5818e64f2fc735 into 24425d5e61fabb08e632fcfbdfbb423b7ff6acaa
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b6ad0233
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b6ad0233
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b6ad0233
Branch: refs/pull/76/merge
Commit: b6ad02339d9bfec93861d564b7e292c9f31bc6e9
Parents: 24425d5 1f71604
Author: GERey <gr...@apigee.com>
Authored: Thu Mar 20 06:56:49 2014 +0000
Committer: GERey <gr...@apigee.com>
Committed: Thu Mar 20 06:56:49 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(-)
----------------------------------------------------------------------
[2/3] git commit: extended time to wait for 3 seconds to have more
give.
Posted by sn...@apache.org.
extended time to wait for 3 seconds to have more give.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1f716040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1f716040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1f716040
Branch: refs/pull/76/head
Commit: 1f71604016d0c04d99e820015b5818e64f2fc735
Parents: f945616
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 23:56:50 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 23:56:50 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1f716040/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 8000b25..0c0e8e1 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1554,7 +1554,7 @@ public class ManagementServiceIT {
AsyncBlobStore blobStore = context.getAsyncBlobStore();
ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
- bo = futureETag.get( 1, TimeUnit.SECONDS );
+ bo = futureETag.get( 3, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}
@@ -1644,7 +1644,7 @@ public class ManagementServiceIT {
AsyncBlobStore blobStore = context.getAsyncBlobStore();
ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
- bo = futureETag.get( 1, TimeUnit.SECONDS );
+ bo = futureETag.get( 3, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}
[3/3] git commit: extended time to wait for 3 seconds to have more
give.
Posted by sn...@apache.org.
extended time to wait for 3 seconds to have more give.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/1f716040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/1f716040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/1f716040
Branch: refs/pull/76/merge
Commit: 1f71604016d0c04d99e820015b5818e64f2fc735
Parents: f945616
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 23:56:50 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 23:56:50 2014 -0700
----------------------------------------------------------------------
.../usergrid/management/cassandra/ManagementServiceIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/1f716040/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 8000b25..0c0e8e1 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -1554,7 +1554,7 @@ public class ManagementServiceIT {
AsyncBlobStore blobStore = context.getAsyncBlobStore();
ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
- bo = futureETag.get( 1, TimeUnit.SECONDS );
+ bo = futureETag.get( 3, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}
@@ -1644,7 +1644,7 @@ public class ManagementServiceIT {
AsyncBlobStore blobStore = context.getAsyncBlobStore();
ListenableFuture<Blob> futureETag = blobStore.getBlob( bucketName,s3Export.getFilename() );
- bo = futureETag.get( 1, TimeUnit.SECONDS );
+ bo = futureETag.get( 3, TimeUnit.SECONDS );
}catch(Exception e) {
assert(false);
}