You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/10 00:04:32 UTC
[12/16] git commit: fix merge
fix merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f43e4f5c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f43e4f5c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f43e4f5c
Branch: refs/heads/two-dot-o
Commit: f43e4f5c3edc634f9cb6ab6b32d0f31a5f5efb0a
Parents: a61e146
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 9 14:01:25 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 9 14:01:25 2014 -0600
----------------------------------------------------------------------
.../collection/impl/EntityCollectionManagerImpl.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f43e4f5c/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index a1b9a13..c57f666 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@ -325,13 +325,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
@Override
-<<<<<<< HEAD
- public Observable<VersionSet> getLatestVersion(
- Collection<Id> entityIds) {
- VersionSet logEntries = mvccLogEntrySerializationStrategy.load(collectionScope, entityIds,
- UUIDGenerator.newTimeUUID());
-=======
public Observable<VersionSet> getLatestVersion( final Collection<Id> entityIds ) {
return Observable.create( new Observable.OnSubscribe<VersionSet>() {
@@ -349,10 +343,6 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
subscriber.onError( e );
}
}
- } );
-
->>>>>>> b3515f45cdfdcc0eedd6e667701f69eccad37a7d
-
-
+ } );
}
}