[GNUnet-SVN] [gnunet] 03/06: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

xrs pushed a commit to branch master
in repository gnunet.

commit 2770964bdd8f33c081e3b22c7295e7949e525188
Merge: 461426cf3 4ac7b35eb
Author: xrs <address@hidden>
AuthorDate: Wed Oct 3 18:52:46 2018 +0200

    Merge branch 'master' of ssh://gnunet.org/gnunet

 configure.ac                                       |    1 -
 contrib/benchmark/collect.awk                      |  110 ++
 contrib/benchmark/collect_ops.awk                  |   45 -
 contrib/benchmark/collect_urls.awk                 |   47 -
 po/POTFILES.in                                     |  127 +-
 src/Makefile.am                                    |    6 +-
 src/credential/Makefile.am                         |   20 -
 src/curl/curl.c                                    |    9 +-
 src/include/gnunet_protocols.h                     |   18 +-
 src/include/gnunet_rps_service.h                   |    2 +-
 src/include/gnunet_time_lib.h                      |   14 +
 src/jsonapi/.gitignore                             |    1 -
 src/jsonapi/Makefile.am                            |   68 -
 src/jsonapi/jsonapi.c                              |   82 -
 src/jsonapi/jsonapi_document.c                     |  402 -----
 src/jsonapi/jsonapi_error.c                        |  241 ---
 src/jsonapi/jsonapi_objects.h                      |  162 --
 src/jsonapi/jsonapi_relationship.c                 |   17 -
 src/jsonapi/jsonapi_resource.c                     |  367 -----
 src/jsonapi/test_jsonapi.c                         |  190 ---
 src/rest-plugins/Makefile.am                       |   32 +-
 src/rest-plugins/json_reclaim.c                    |  240 +++
 src/rest-plugins/json_reclaim.h                    |   46 +
 .../plugin_rest_credential.c                       |    0
 src/rest-plugins/plugin_rest_openid_connect.c      |   83 +-
 .../plugin_rest_reclaim.c                          |  391 ++---
 src/rps/Makefile.am                                |    9 +-
 src/rps/gnunet-rps-profiler.c                      |    4 +-
 src/rps/gnunet-service-rps.c                       | 1651 +++++++++-----------
 src/rps/gnunet-service-rps_sampler.c               |  647 +-------
 src/rps/gnunet-service-rps_sampler.h               |   26 +-
 src/rps/gnunet-service-rps_view.c                  |  160 +-
 src/rps/gnunet-service-rps_view.h                  |   51 +-
 src/rps/rps-sampler_client.c                       |  327 ++++
 ...-service-rps_sampler.h => rps-sampler_client.h} |   36 +-
 ...-service-rps_sampler.c => rps-sampler_common.c} |  644 ++------
 ...-service-rps_sampler.h => rps-sampler_common.h} |  210 ++-
 src/rps/rps.conf.in                                |    1 +
 src/rps/rps.h                                      |   71 -
 src/rps/rps_api.c                                  |  549 ++++---
 src/rps/test_service_rps_view.c                    |  141 +-
 src/util/benchmark.c                               |    5 +-
 src/util/time.c                                    |   57 +
 43 files changed, 2578 insertions(+), 4732 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden