You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gossip.apache.org by ec...@apache.org on 2017/07/17 22:58:11 UTC
[2/2] incubator-gossip git commit: Merge branch 'GOSSIP-66' of
https://github.com/makrusak/incubator-gossip
Merge branch 'GOSSIP-66' of https://github.com/makrusak/incubator-gossip
Project: http://git-wip-us.apache.org/repos/asf/incubator-gossip/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gossip/commit/95cce48a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gossip/tree/95cce48a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gossip/diff/95cce48a
Branch: refs/heads/master
Commit: 95cce48a8e5a9e685d654a79ef082c47dd485df1
Parents: 6ef0eb7 89af0ac
Author: edward <ed...@hollywood.ian>
Authored: Mon Jul 17 18:54:26 2017 -0400
Committer: edward <ed...@hollywood.ian>
Committed: Mon Jul 17 18:54:26 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/gossip/crdt/CrdtModule.java | 8 ++
.../org/apache/gossip/crdt/TwoPhaseSet.java | 115 ++++++++++++++++
.../gossip/crdt/AbstractCRDTStringSetTest.java | 133 ------------------
.../gossip/crdt/AddRemoveStringSetTest.java | 137 +++++++++++++++++++
.../java/org/apache/gossip/crdt/LwwSetTest.java | 2 +-
.../apache/gossip/crdt/MaxChangeSetTest.java | 2 +-
.../java/org/apache/gossip/crdt/OrSetTest.java | 2 +-
.../org/apache/gossip/crdt/TwoPhaseSetTest.java | 101 ++++++++++++++
.../test/java/org/apache/gossip/DataTest.java | 6 +
.../gossip/protocol/json/JacksonTest.java | 12 +-
10 files changed, 379 insertions(+), 139 deletions(-)
----------------------------------------------------------------------