You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/01 18:51:37 UTC

[2/3] git commit: Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o


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

Branch: refs/heads/two-dot-o
Commit: 8815abd60a604136f0c540cce8a39ab11762319a
Parents: 377b074 2678eae
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Oct 1 10:50:23 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Oct 1 10:50:23 2014 -0600

----------------------------------------------------------------------
 .../collection/EntityCollectionManager.java     |  12 +-
 .../collection/event/EntityDeleted.java         |  25 +
 .../collection/event/EntityVersionCreated.java  |  25 +
 .../collection/event/EntityVersionDeleted.java  |  29 +
 .../collection/guice/CollectionModule.java      |  18 +-
 .../guice/CollectionTaskExecutor.java           |  35 +
 .../impl/EntityCollectionManagerImpl.java       |  14 +
 .../impl/EntityVersionCleanupTask.java          | 198 ++++++
 .../serialization/SerializationFig.java         |  32 +-
 .../serialization/impl/LogEntryIterator.java    | 114 +++
 .../EntityCollectionManagerStressTest.java      |   2 +
 .../impl/EntityVersionCleanupTaskTest.java      | 690 +++++++++++++++++++
 .../impl/LogEntryIteratorTest.java              | 131 ++++
 .../collection/util/LogEntryMock.java           | 152 ++++
 .../core/astyanax/AstyanaxKeyspaceProvider.java |   2 +
 .../persistence/core/guice/CommonModule.java    |   2 +
 .../core/task/NamedTaskExecutorImpl.java        | 167 +++++
 .../usergrid/persistence/core/task/Task.java    |  31 +
 .../persistence/core/task/TaskExecutor.java     |  23 +
 .../core/task/NamedTaskExecutorImplTest.java    | 227 ++++++
 .../usergrid/persistence/graph/GraphFig.java    |   2 +
 .../persistence/graph/event/EdgeDeleted.java    |   8 +
 .../persistence/graph/guice/GraphModule.java    |  16 +
 .../graph/guice/GraphTaskExecutor.java          |  33 +
 .../impl/shard/impl/NodeShardCacheImpl.java     |   5 -
 .../shard/impl/ShardGroupCompactionImpl.java    | 175 +++--
 .../graph/GraphManagerStressTest.java           |   1 +
 .../impl/shard/ShardGroupCompactionTest.java    |   5 +-
 28 files changed, 2081 insertions(+), 93 deletions(-)
----------------------------------------------------------------------