diff options
| author | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
|---|---|---|
| committer | xrs <xrs@mail36.net> | 2018-06-23 16:58:42 +0200 |
| commit | 99c6e18e63181d8759ecbb398d58019a55d3ce6f (patch) | |
| tree | cf925bf99a6fbe60dbec8ead7248bc59a0c8cce6 /src/consensus | |
| parent | b993ca621717d0a9958b4138a32fb1e3cef7f54c (diff) | |
| parent | c293f84ea192f361baf720a3979589c0e0881abc (diff) | |
| download | gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.tar.gz gnunet-99c6e18e63181d8759ecbb398d58019a55d3ce6f.zip | |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/consensus')
| -rw-r--r-- | src/consensus/consensus.conf.in | 2 | ||||
| -rw-r--r-- | src/consensus/test_consensus.conf | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in index 2afee04db..b0fbcaf5a 100644 --- a/src/consensus/consensus.conf.in +++ b/src/consensus/consensus.conf.in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | [consensus] | 1 | [consensus] |
| 2 | AUTOSTART = @AUTOSTART@ | 2 | START_ON_DEMAND = @START_ON_DEMAND@ |
| 3 | @JAVAPORT@PORT = 2103 | 3 | @JAVAPORT@PORT = 2103 |
| 4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
| 5 | BINARY = gnunet-service-consensus | 5 | BINARY = gnunet-service-consensus |
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf index 6cb0885b0..42e06a66d 100644 --- a/src/consensus/test_consensus.conf +++ b/src/consensus/test_consensus.conf | |||
| @@ -54,13 +54,13 @@ OPERATION_TIMEOUT = 60 s | |||
| 54 | MAX_OPEN_FDS = 4096 | 54 | MAX_OPEN_FDS = 4096 |
| 55 | 55 | ||
| 56 | [hostlist] | 56 | [hostlist] |
| 57 | AUTOSTART = NO | 57 | START_ON_DEMAND = NO |
| 58 | 58 | ||
| 59 | [fs] | 59 | [fs] |
| 60 | AUTOSTART = NO | 60 | START_ON_DEMAND = NO |
| 61 | 61 | ||
| 62 | [revocation] | 62 | [revocation] |
| 63 | AUTOSTART = NO | 63 | START_ON_DEMAND = NO |
| 64 | 64 | ||
| 65 | [nat] | 65 | [nat] |
| 66 | # Use addresses from the local network interfaces (inluding loopback, but also others) | 66 | # Use addresses from the local network interfaces (inluding loopback, but also others) |