fix conflicts

.gitignore

@@ -19,3 +19,4 @@ _tdeps
 logs
 erln8.config
 .local_dialyzer_plt
+deps/*

.travis.yml

@@ -1,16 +1,14 @@
 language: erlang
 otp_release:
-  - 18.0
+  - 18.1
   - 17.4
-  - 17.2
   - R16B03
-  - R16B02
-  - R16B01
-  - R15B03
 script:
   - make dialyzer
   - make xref
   - make
   - make test
 notifications:
+  email: [email protected]
   email: [email protected]
+sudo: false

LICENSE

@@ -1,3 +1,4 @@
+Copyright (c) 2015, Christopher Meiklejohn
 Copyright (c) 2015, Basho Technologies, Inc
 Copyright (c) 2015, Helium Systems, Inc
 All rights reserved.

Makefile

@@ -1,7 +1,7 @@
-.PHONY: deps compile rel
+REBAR = $(shell pwd)/rebar3
+.PHONY: deps compile rel test
 
 DIALYZER_APPS = kernel stdlib erts sasl eunit syntax_tools compiler crypto
-REBAR="./rebar3"
 DEP_DIR="_build/lib"
 
 all: compile
@@ -11,14 +11,16 @@ include tools.mk
 test: common_test
 
 common_test:
-	./rebar3 ct
+	$(REBAR) ct
 
-compile: deps
-	./rebar3 compile
+compile:
+	$(REBAR) compile
 
 rel:
-	./rebar3 release
+	$(REBAR) release
 
 stage:
-	./rebar3 release -d
+	$(REBAR) release -d
 
+dialyzer:
+	$(REBAR) dialyzer

README.md

@@ -1,25 +1,13 @@
-plumtree
-=====
+Plumtree
+=======================================================
 
-Plumtree is an implementation of Plumtree[1], the epidemic broadcast protocol.
-It is extracted from the implementation in riak_core[2]. Instead of
-the riak_core ring and riak's ring gossip protocol, it includes a standalone
-membership gossip, built around riak_dt[3]'s ORSWOT[4].
+[![Build Status](https://travis-ci.org/helium/plumtree.svg?branch=master)](https://travis-ci.org/helium/plumtree)
 
-More information on the plumtree protocol and it's history we encourage you
-to watch Jordan West's RICON West 2013 talk[5] and Joao Leitao & Jordan West's
-RICON 2014 talk[6].
+Plumtree is an implementation of [Plumtree](http://www.gsd.inesc-id.pt/~jleitao/pdf/srds07-leitao.pdf), the epidemic broadcast protocol.  It is extracted from the implementation in [Riak Core](https://github.com/basho/riak_core). Instead of the riak_core ring and riak's ring gossip protocol, it includes a standalone membership gossip, built around the [Riak DT](https://github.com/basho/riak_dt) [ORSWOT](http://haslab.uminho.pt/cbm/files/1210.3368v1.pdf).
 
-A special thanks to Jordan, Joao and the team at Basho for providing much of
-the code contained in this library. 
-
-1. http://www.gsd.inesc-id.pt/~jleitao/pdf/srds07-leitao.pdf
-2. https://github.com/basho/riak_core
-3. https://github.com/basho/riak_dt
-4. http://haslab.uminho.pt/cbm/files/1210.3368v1.pdf
-5. https://www.youtube.com/watch?v=s4cCUTPU8GI
-6. https://www.youtube.com/watch?v=bo367a6ZAwM
+More information on the plumtree protocol and it's history we encourage you to watch Jordan West's [RICON West 2013 talk](https://www.youtube.com/watch?v=s4cCUTPU8GI) and Joao Leitao & Jordan West's [RICON 2014 talk](https://www.youtube.com/watch?v=bo367a6ZAwM).
 
+A special thanks to Jordan, Joao and the team at Basho for providing much of the code contained in this library.
 
 Build
 -----
@@ -36,14 +24,12 @@ Testing
 Contributing
 ----
 
-Contributions from the community are encouraged. This project follows the 
-git-flow workflow. If you want to contribute:
+Contributions from the community are encouraged. This project follows the git-flow workflow. If you want to contribute:
 
-* Fork this repository 
+* Fork this repository
 * Make your changes and run the full test suite
  * Please include any additional tests for any additional code added
 * Commit your changes and push them to your fork
 * Open a pull request
 
-We will review your changes, make appropriate suggestions and/or provide
-feedback, and merge your changes when ready. 
+We will review your changes, make appropriate suggestions and/or provide feedback, and merge your changes when ready.

include/plumtree.hrl

@@ -0,0 +1 @@
+-define(SET, riak_dt_orswot).

rebar.config

@@ -1,12 +1,17 @@
-{erl_opts, [warnings_as_errors, debug_info, {parse_transform, lager_transform}]}.
 {deps, [
-        {lager, {git, "git://github.com/basho/lager.git", {tag, "2.1.1"}}},
-        {riak_dt, {git, "git://github.com/basho/riak_dt.git", {tag, "2.1.0"}}},
-        {eleveldb, {git, "git://github.com/helium/eleveldb.git", {branch, "adt-helium"}}}
+        {lasp_support, ".*", {git, "git://github.com/lasp-lang/lasp_support.git", {branch, "master"}}},
+        {time_compat, ".*", {git, "git://github.com/lasp-lang/time_compat.git", {branch, "master"}}},
+        {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "2.1.1"}}},
+        {riak_dt, ".*", {git, "git://github.com/basho/riak_dt.git", {tag, "develop"}}},
+        {eleveldb, ".*", {git, "git://github.com/lasp-lang/eleveldb.git", {branch, "develop"}}}
        ]}.
 
 {dialyzer_base_plt_apps, [kernel, stdlib, erts, sasl, eunit, syntax_tools, compiler, crypto]}.
-
 {xref_checks, [undefined_function_calls]}.
-
+{erl_opts, [debug_info,
+            warnings_as_errors,
+            {platform_define, "^[0-9]+", namespaced_types},
+            {parse_transform, lager_transform}]}.
 {cover_enabled, true}.
+{eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}.
+{edoc_opts, [{preprocess, true}]}.

rebar.lock

@@ -1,16 +1,36 @@
-[{<<"eleveldb">>,
-  {git,"git://github.com/helium/eleveldb.git",
-       {ref,"4e199ab1518060d348ae0f9719d2cbf9f098e00d"}},
-  0},
+[{<<"neotoma">>,
+  {git,"git://github.com/seancribbs/neotoma.git",
+       {ref,"6ac6007c7713712a80096de5c7cdf5b85b01374e"}},
+  2},
+ {<<"getopt">>,
+  {git,"git://github.com/jcomellas/getopt.git",
+       {ref,"388dc95caa7fb97ec7db8cfc39246a36aba61bd8"}},
+  2},
  {<<"goldrush">>,
   {git,"git://github.com/DeadZen/goldrush.git",
        {ref,"71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
   1},
+ {<<"cuttlefish">>,
+  {git,"git://github.com/basho/cuttlefish.git",
+       {ref,"68d54f6b7f0e1e1528fc6ae8555c424d12a31d68"}},
+  1},
+ {<<"time_compat">>,
+  {git,"git://github.com/lasp-lang/time_compat.git",
+       {ref,"adfae4409187cc1a9f79028986e92e8730b5eda5"}},
+  0},
+ {<<"riak_dt">>,
+  {git,"git://github.com/basho/riak_dt.git",
+       {ref,"a2986bccd1cc42facdfe739495c6d13762ae0f37"}},
+  0},
+ {<<"lasp_support">>,
+  {git,"git://github.com/lasp-lang/lasp_support.git",
+       {ref,"f682f79801d3573db86bc55d849529a2a98edcfc"}},
+  0},
  {<<"lager">>,
   {git,"git://github.com/basho/lager.git",
        {ref,"d33ccf3b69de09a628fe38b4d7981bb8671b8a4f"}},
   0},
- {<<"riak_dt">>,
-  {git,"git://github.com/basho/riak_dt.git",
-       {ref,"f7981d4ad7407ddc085f133f204dd71bf9d50c56"}},
+ {<<"eleveldb">>,
+  {git,"git://github.com/lasp-lang/eleveldb.git",
+       {ref,"f33872c3c377015d1b282f956e98938528c901b0"}},
   0}].