[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/03: resolve merge conflict with peerinfo plugin
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/03: resolve merge conflict with peerinfo plugin move |
|
Date: |
Tue, 14 Aug 2018 11:17:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 5bb2565bab0b8fa8cac263b9fb70edf3ae2278d9
Merge: 97e725212 4cc09ba10
Author: Christian Grothoff <address@hidden>
AuthorDate: Tue Aug 14 11:17:30 2018 +0200
resolve merge conflict with peerinfo plugin move
configure.ac | 1 +
po/POTFILES.in | 12 +-
src/Makefile.am | 8 +-
src/cadet/Makefile.am | 12 +-
src/cadet/cadet_api.c | 3 +
src/cadet/gnunet-service-cadet_hello.c | 7 +-
src/cadet/test_cadet.c | 261 +++++--
src/gns/Makefile.am | 19 -
src/hostlist/hostlist.conf | 2 +
src/identity/Makefile.am | 19 -
src/identity/gnunet-service-identity.c | 2 +-
src/identity/test_plugin_rest_identity.sh | 159 ----
src/json/json_generator.c | 32 +-
src/json/json_gnsrecord.c | 8 +-
src/jsonapi/Makefile.am | 19 +
src/{reclaim => jsonapi}/plugin_rest_reclaim.c | 0
src/namestore/Makefile.am | 23 +-
src/namestore/test_plugin_rest_namestore.sh | 208 ------
src/peerinfo-tool/Makefile.am | 21 -
src/peerinfo/Makefile.am | 1 -
src/reclaim/Makefile.am | 33 -
src/rest-plugins/Makefile.am | 105 +++
src/{reclaim => rest-plugins}/oidc_helper.c | 0
src/{reclaim => rest-plugins}/oidc_helper.h | 0
src/{rest => rest-plugins}/plugin_rest_copying.c | 0
src/{gns => rest-plugins}/plugin_rest_gns.c | 62 +-
.../plugin_rest_identity.c | 806 +++++++++++++-------
.../plugin_rest_namestore.c | 524 +++++++------
.../plugin_rest_openid_connect.c | 0
.../plugin_rest_peerinfo.c | 57 +-
src/{gns => rest-plugins}/test_plugin_rest_gns.sh | 22 +-
src/rest-plugins/test_plugin_rest_identity.sh | 157 ++++
src/rest-plugins/test_plugin_rest_namestore.sh | 147 ++++
src/rest/Makefile.am | 13 -
src/rps/gnunet-rps-profiler.c | 20 +-
src/rps/gnunet-service-rps.c | 828 ++++++++-------------
src/rps/gnunet-service-rps_custommap.c | 1 +
src/rps/rps-test_util.c | 2 +-
src/rps/test_rps.c | 2 +-
src/rps/test_rps.conf | 3 +-
40 files changed, 1940 insertions(+), 1659 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden