[GNUnet-SVN] [gnunet] 64/64: Merge branch 'fix_social'

[gnunet]

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

lurchi pushed a commit to branch master
in repository gnunet.

commit 5c8feda7faa01365a1fb6983595ceb65dfe4fb11
Merge: d01f1bd83 8412625bb
Author: lurchi <address@hidden>
AuthorDate: Sat Dec 30 20:46:59 2017 +0100

    Merge branch 'fix_social'

 src/cadet/gnunet-service-cadet_tunnels.c           |   4 +-
 .../gnunet-helper-audio-playback-gst.c             |   5 +
 src/conversation/gnunet-helper-audio-playback.c    |   5 +
 src/conversation/gnunet_gst.c                      |   5 +
 src/conversation/microphone.c                      |   4 +-
 src/core/gnunet-service-core.c                     |   3 +
 src/core/gnunet-service-core_kx.c                  |   3 +
 src/fs/fs_dirmetascan.c                            |   3 +
 src/include/gnunet_mst_lib.h                       |   4 +-
 src/include/gnunet_protocols.h                     |  30 +-
 src/include/gnunet_service_lib.h                   |   7 +-
 src/multicast/gnunet-service-multicast.c           | 248 ++++---
 src/multicast/multicast_api.c                      |  51 +-
 src/multicast/test_multicast_multipeer.c           | 312 +++++----
 src/psyc/gnunet-service-psyc.c                     | 131 ++--
 src/psyc/psyc_api.c                                | 103 ++-
 src/psyc/test_psyc.c                               |  28 +-
 src/psyc/test_psyc.conf                            |  16 +
 src/psycstore/psycstore_api.c                      |  10 +-
 src/social/gnunet-service-social.c                 | 774 +++++++++++----------
 src/social/gnunet-social.c                         |  26 +-
 src/social/social_api.c                            | 292 +++++---
 src/social/test_social.c                           | 268 ++++---
 src/social/test_social.conf                        |  19 +
 src/statistics/gnunet-service-statistics.c         |   4 +-
 src/testbed/gnunet-helper-testbed.c                |   7 +-
 src/transport/gnunet-helper-transport-wlan-dummy.c |   6 +
 src/transport/plugin_transport_http_server.c       |   2 +-
 src/util/client.c                                  |  41 +-
 src/util/mq.c                                      |  22 +
 src/util/mst.c                                     |  27 +-
 src/util/scheduler.c                               |   4 +-
 src/util/service.c                                 |  31 +-
 src/vpn/gnunet-service-vpn.c                       |   3 +
 34 files changed, 1500 insertions(+), 998 deletions(-)

diff --cc src/social/gnunet-social.c
index de680b11c,0de8809ff..12c5bf2e1
--- a/src/social/gnunet-social.c
+++ b/src/social/gnunet-social.c
@@@ -281,9 -281,9 +281,9 @@@ exit_fail (
   * This also indicates the end of the connection to the service.
   */
  static void
 -host_left ()
 +host_left (void *cls)
  {
-   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+   GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
                "The host has left the place.\n");
    exit_success ();
  }

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