Merge develop-2.2 into develop#113

Merged

JeetKunDoug merged 41 commits intodevelopfrom

Oct 17, 2016

Commits on Sep 4, 2014

Set rebar.config deps back to 2.0 branches
jaredmorrow
committed

Commits on Jun 10, 2015

Add Apache 2 License.

Sean Cribbs
authored and
nickelization
committed
Avoid locking when opening a synctree leveldb

ian-mi
authored and
nickelization
committed
Remove unused safe_open and reopen functions from synctree_leveldb

ian-mi
authored and
nickelization
committed
Use custom script for tests.
cmeiklejohn
committed
Merge pull request #76 from basho/features/csm/test-target
cmeiklejohn
committed
Merge pull request #74 from basho/nem-add-apache-license-2.0
cmeiklejohn
committed
Merge pull request #75 from basho/nem-synctree-lock-2.0-port
cmeiklejohn
committed

Commits on Jul 2, 2015

Update rebar.config to float on 2.1 branch of eleveldb.
Doug Rohrer
committed
Forward Merge branch '2.0' into dtr/forward_merge_2.0
Doug Rohrer
committed

Commits on Jul 7, 2015

Merge pull request #78 from basho/dtr/forward_merge_2.0
borshop
committed

Commits on Oct 13, 2015

Commits on Feb 24, 2016

Commits on Mar 24, 2016

Upgrade eleveldb to 2.2.15
Brian Sparrow
committed

Commits on Mar 25, 2016

Merge pull request #96 from basho/bjs/eleveldb-upgrade-2.2.15
borshop
committed

Commits on Jun 28, 2016

Commits on Jun 29, 2016

Commits on Jun 30, 2016

Merge pull request #106 from basho/nem-post-merge-fixups
borshop
authored

Commits on Jul 5, 2016

Updated rebar.config to point to eleveldb 2.2.19
fadushin
committed

Commits on Jul 6, 2016

Commits on Aug 24, 2016

Add debug log messages for peer state transitions
nickelization
committed

Commits on Aug 25, 2016

Merge pull request #109 from basho/nem-log-peer-state-transitions
nickelization
authored

Commits on Sep 7, 2016

Bumped eleveldb dependency to 2.0.28
fadushin
committed

Commits on Sep 8, 2016

Merge pull request #110 from basho/fd-eleveldb-dep
fadushin
authored

Commits on Sep 15, 2016

Bumped eleveldb to 2.0.29
fadushin
committed
Merge pull request #111 from basho/fd-elevedb-bump
Brett Hazen
authored

Commits on Sep 21, 2016

Update lager to 3.2.1
Brian Sparrow
committed
Merge pull request #112 from basho/feature-bjs-lager3.2.1
Brett Hazen
authored

Commits on Sep 22, 2016

updated lager dependency
fadushin
committed

Commits on Oct 11, 2016

Updated eleveldb dependency.
fadushin
committed