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/11 16:20:49 UTC
[09/10] git commit: Merge e072f0bdb7d58f37a17add88ba00f147a6e95a17
into 5f6ca3164a36fb556ca2554ebaf9c408cc642bdf
Merge e072f0bdb7d58f37a17add88ba00f147a6e95a17 into 5f6ca3164a36fb556ca2554ebaf9c408cc642bdf
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bb0d0a3d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bb0d0a3d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bb0d0a3d
Branch: refs/pull/52/merge
Commit: bb0d0a3d1d2412364f22f941b8014b1a6f7971d9
Parents: 5f6ca31 e072f0b
Author: Dave Johnson <da...@rollerweblogger.org>
Authored: Tue Mar 11 14:20:43 2014 +0000
Committer: Dave Johnson <da...@rollerweblogger.org>
Committed: Tue Mar 11 14:20:43 2014 +0000
----------------------------------------------------------------------
.../astyanax/IdRowCompositeSerializer.java | 4 +-
.../exception/WriteCommitException.java | 44 +++++++
.../WriteOptimisticVerifyException.java | 44 +++++++
.../exception/WriteStartException.java | 44 +++++++
.../exception/WriteUniqueVerifyException.java | 44 +++++++
.../collection/guice/CollectionModule.java | 25 ++--
.../impl/EntityCollectionManagerImpl.java | 15 +--
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 3 +
.../mvcc/stage/write/WriteCommit.java | 13 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 81 ++++++++++--
.../collection/mvcc/stage/write/WriteStart.java | 11 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 18 ++-
.../serialization/impl/SerializationModule.java | 21 ++-
.../changelog/ChangeLogGeneratorImplTest.java | 44 ++++---
.../stage/write/WriteOptimisticVerifyTest.java | 132 +++++++++++++++++++
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 2 +-
16 files changed, 472 insertions(+), 73 deletions(-)
----------------------------------------------------------------------