Skip to content

Commit

Permalink
Revert "Merge tag 'neo-v0.11.0' into v14.x.x"
Browse files Browse the repository at this point in the history
This reverts commit b051bb7, reversing
changes made to 5a1e359.
  • Loading branch information
Gavin Norman committed Apr 25, 2019
1 parent b051bb7 commit 57003b5
Show file tree
Hide file tree
Showing 95 changed files with 78 additions and 17,415 deletions.
4 changes: 3 additions & 1 deletion Build.mak
@@ -1,6 +1,5 @@
export ASSERT_ON_STOMPING_PREVENTION=1

override LDFLAGS += -llzo2 -lebtree -lrt -lgcrypt -lgpg-error -lglib-2.0 -lpcre
override DFLAGS += -w

ifeq ($(DVER),1)
Expand All @@ -15,6 +14,9 @@ $B/fakedht: override LDFLAGS += -llzo2 -lebtree -lrt -lpcre

all += $B/fakedht

$O/%unittests: override LDFLAGS += -llzo2 -lebtree -lrt -lpcre

$O/test-fakedht: override LDFLAGS += -llzo2 -lebtree -lrt -lpcre
$O/test-fakedht: $B/fakedht

$B/dhtapp: $C/src/dummydhtapp/main.d
Expand Down
21 changes: 0 additions & 21 deletions README.rst
Expand Up @@ -14,27 +14,6 @@ Table (DHT), including:
The test is run, in this repo, on a fake node, but it can be reused in other
repos to test real node implementations. (``src.dhttest``)

A Tale of Two Protocols
-----------------------

The code in this repo is currently in transition. There exist two parallel
client/server architectures in the repo, a new architecture (dubbed "neo") --
based on the core code in the ``swarm/neo`` package -- and a legacy architecture
-- based on the core code located in the other packages of ``swarm``. The neo
protocol is being introduced in stages, progressively adding features to the
core client and server code over a series of alpha releases in a separate branch
(named ``neo``).

Note that the DHT client and node defined in this repo support *both* neo and
legacy features.

When the alpha releases are considered stable, the ``neo`` branch will be merged
into the main release branch (currently ``v13.x.x``).

When sufficient neo features have been implemented and the legacy protocol is no
longer in active use, the legacy protocol will be deprecated and eventually
removed.

Dependencies
============

Expand Down
2 changes: 1 addition & 1 deletion beaver.Dockerfile
@@ -1 +1 @@
FROM sociomantictsunami/dlang:v3
FROM sociomantictsunami/dlang:v2
1 change: 1 addition & 0 deletions docker/build
Expand Up @@ -2,6 +2,7 @@
set -xe

# Install dependencies
apt-get update
apt-get install -y \
liblzo2-dev \
libebtree6-dev \
Expand Down
12 changes: 0 additions & 12 deletions relnotes/connect.feature.md

This file was deleted.

15 changes: 0 additions & 15 deletions relnotes/ctor.feature.md

This file was deleted.

8 changes: 0 additions & 8 deletions relnotes/neo.feature.md

This file was deleted.

0 comments on commit 57003b5

Please sign in to comment.