usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [4/4] git commit: Merge f7a5072003ec00a250a8131a4deee845e7e7cfd9 into 5f6ca3164a36fb556ca2554ebaf9c408cc642bdf
Date Wed, 12 Mar 2014 19:23:48 GMT
Merge f7a5072003ec00a250a8131a4deee845e7e7cfd9 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/ebd9b65b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ebd9b65b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ebd9b65b

Branch: refs/pull/52/merge
Commit: ebd9b65bb5950cd8185d36e66effce6640109569
Parents: 5f6ca31 f7a5072
Author: Dave Johnson <dave.johnson@rollerweblogger.org>
Authored: Wed Mar 12 18:20:52 2014 +0000
Committer: Dave Johnson <dave.johnson@rollerweblogger.org>
Committed: Wed Mar 12 18:20:52 2014 +0000

----------------------------------------------------------------------
 .../astyanax/IdRowCompositeSerializer.java      |   4 +-
 .../exception/WriteCommitException.java         |  44 +++++
 .../WriteOptimisticVerifyException.java         |  44 +++++
 .../exception/WriteStartException.java          |  44 +++++
 .../exception/WriteUniqueVerifyException.java   |  58 ++++++
 .../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 | 179 +++++++++++++++++-
 .../collection/mvcc/stage/write/WriteStart.java |  11 +-
 .../mvcc/stage/write/WriteUniqueVerify.java     |  79 ++++----
 .../serialization/impl/SerializationModule.java |  21 ++-
 .../changelog/ChangeLogGeneratorImplTest.java   |  44 +++--
 .../mvcc/entity/impl/MvccEntityImplTest.java    |  23 ++-
 .../stage/write/WriteOptimisticVerifyTest.java  | 182 +++++++++++++++++++
 .../mvcc/stage/write/WriteUniqueVerifyIT.java   |  97 ++++++++++
 .../mvcc/stage/write/WriteUniqueVerifyTest.java |  25 +--
 .../collection/util/EntityBuilder.java          | 177 ++++++++++++++++++
 .../src/test/resources/log4j.properties         |   4 +-
 .../index/impl/EntityCollectionIndexTest.java   |   2 +-
 .../persistence/index/legacy/EntityBuilder.java | 177 ------------------
 .../index/legacy/EntityManagerFacade.java       |   1 +
 23 files changed, 965 insertions(+), 307 deletions(-)
----------------------------------------------------------------------



Mime
View raw message