[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 82/171: Merge remote-tracking branch 'origin/maste
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 82/171: Merge remote-tracking branch 'origin/master' into credentials |
Date: |
Thu, 04 Jan 2018 16:09:50 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit f599b93d5b402cfa795aaf7bd7057d76c5e57d67
Merge: d80df28d5 6cc0e5071
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Mon Jul 3 10:31:57 2017 +0200
Merge remote-tracking branch 'origin/master' into credentials
src/block/block.c | 5 +--
src/cadet/cadet_api.c | 2 +-
src/cadet/gnunet-service-cadet_channel.c | 2 ++
src/cadet/gnunet-service-cadet_connection.c | 4 ++-
src/cadet/gnunet-service-cadet_tunnels.c | 4 ++-
src/core/test_core_quota_peer1.conf | 4 +++
src/core/test_core_quota_peer2.conf | 4 +++
src/datacache/datacache.c | 6 ++--
src/datacache/plugin_datacache_postgres.c | 10 +++---
src/dht/Makefile.am | 4 +--
src/dht/test_dht_tools.py.in | 13 +++-----
src/exit/gnunet-daemon-exit.c | 15 +++++----
src/include/gnunet_configuration_lib.h | 6 ++--
.../confs/c_bootstrap_server.conf | 2 +-
src/integration-tests/confs/c_nat_client.conf | 2 +-
src/integration-tests/confs/c_no_nat_client.conf | 2 +-
src/integration-tests/confs/c_no_nat_client_2.conf | 2 +-
src/nat-auto/gnunet-service-nat-auto.c | 2 +-
src/nat-auto/nat_auto_api.c | 2 +-
src/pq/pq_result_helper.c | 30 +++++++++++++++---
src/psycstore/plugin_psycstore_postgres.c | 29 ++++++++++-------
src/set/gnunet-service-set_union.c | 4 ---
src/testbed/gnunet-helper-testbed.c | 5 ++-
src/testbed/testbed_api.c | 5 +--
src/testbed/testbed_api_hosts.c | 5 ++-
src/topology/gnunet-daemon-topology.c | 4 +--
src/transport/plugin_transport_http_server.c | 33 +++++++++++++++++++
src/transport/test_quota_compliance.c | 8 ++---
src/transport/transport-testing.c | 5 ++-
src/util/bandwidth.c | 23 ++++++++------
src/util/common_logging.c | 37 ++++++++++++----------
src/util/configuration.c | 29 +++++++++++++----
src/util/crypto_ecc_setup.c | 6 ++--
src/util/gnunet-service-resolver.c | 3 ++
src/util/resolver_api.c | 2 ++
src/util/test_common_logging_dummy.c | 4 +++
36 files changed, 218 insertions(+), 105 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] 73/171: -fix, (continued)
- [GNUnet-SVN] [gnunet] 73/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 52/171: -fixes, prettify, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 80/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 48/171: -add serializer, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 84/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 81/171: -fix 0-term, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 86/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 74/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 83/171: -fix DEBUG output, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 51/171: -towards type4, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 82/171: Merge remote-tracking branch 'origin/master' into credentials,
gnunet <=
- [GNUnet-SVN] [gnunet] 71/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 79/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 78/171: -fix idp, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 72/171: -fix API changes, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 76/171: Merge remote-tracking branch 'origin/master' into credentials, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 89/171: Merge branch 'abe' into identity_abe, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 104/171: -fix, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 94/171: -add CLI, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 87/171: -towards IdP2, gnunet, 2018/01/04
- [GNUnet-SVN] [gnunet] 62/171: -change api, gnunet, 2018/01/04