[GNUnet-SVN] [gnunet] 80/171: Merge remote-tracking branch 'origin/master' into credentials

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 2d81d6d8217b9aa08139bd66d14c597705568920
Merge: ad5b64d8e d7547ab18
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Jun 23 20:39:27 2017 +0200

    Merge remote-tracking branch 'origin/master' into credentials

 AUTHORS                                      |    1 +
 configure.ac                                 |   59 +-
 contrib/gnunet-gns-import.sh                 |   13 +-
 doc/man/gnunet-ecc.1                         |    6 +-
 guix-env.scm                                 |    8 +-
 pkgconfig/Makefile.am                        |    1 -
 po/POTFILES.in                               |    6 +-
 src/Makefile.am                              |    4 +-
 src/consensus/gnunet-service-consensus.c     |   47 +-
 src/consensus/test_consensus.conf            |    2 +-
 src/conversation/test_conversation.conf      |    2 +-
 src/datacache/Makefile.am                    |    2 +-
 src/datacache/plugin_datacache_postgres.c    |  750 ++++++++--------
 src/datastore/Makefile.am                    |    1 -
 src/datastore/plugin_datastore_postgres.c    |  834 +++++++++---------
 src/datastore/plugin_datastore_sqlite.c      |   54 +-
 src/gns/gnunet-gns-import.c                  |   39 +-
 src/include/Makefile.am                      |    2 +-
 src/include/gnunet_db_lib.h                  |   61 ++
 src/include/gnunet_postgres_lib.h            |  178 ----
 src/include/gnunet_pq_lib.h                  |  268 +++++-
 src/include/gnunet_protocols.h               |    7 +
 src/include/gnunet_strings_lib.h             |    4 +-
 src/multicast/Makefile.am                    |    2 +-
 src/multicast/gnunet-service-multicast.c     |    9 +-
 src/multicast/test_multicast.conf            |   45 +-
 src/multicast/test_multicast_multipeer.c     |   93 +-
 src/namecache/Makefile.am                    |    1 -
 src/namecache/plugin_namecache_postgres.c    |  280 +++---
 src/namestore/Makefile.am                    |    1 -
 src/namestore/gnunet-service-namestore.c     |    7 +-
 src/namestore/namestore_api.c                |   13 +-
 src/namestore/plugin_namestore_postgres.c    |  566 ++++++------
 src/postgres/Makefile.am                     |   24 -
 src/postgres/postgres.c                      |  247 ------
 src/pq/Makefile.am                           |    4 +
 src/pq/pq_connect.c                          |  127 +++
 src/pq/pq_eval.c                             |  281 ++++++
 src/pq/pq_exec.c                             |  106 +++
 src/pq/pq_prepare.c                          |   93 ++
 src/psycstore/Makefile.am                    |    1 -
 src/psycstore/plugin_psycstore_postgres.c    | 1198 +++++++++++---------------
 src/set/gnunet-service-set.c                 |    8 +
 src/set/gnunet-service-set_union.c           |   89 +-
 src/set/gnunet-service-set_union.h           |   10 +
 src/set/set_api.c                            |    2 +-
 src/social/gnunet-social.c                   |    7 +-
 src/transport/Makefile.am                    |    4 +-
 src/transport/plugin_transport_http_server.c |   30 +
 src/util/crypto_hash.c                       |    4 +-
 src/util/gnunet-ecc.c                        |   66 +-
 src/util/service.c                           |    3 +-
 src/zonemaster/gnunet-service-zonemaster.c   |    3 +-
 53 files changed, 2987 insertions(+), 2686 deletions(-)


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