[GNUnet-SVN] [gnunet] 14/15: 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 94d431574c4c4ce98db5382132b34300747ec574
Merge: acfd78293 50d0ee616
Author: xrs <address@hidden>
AuthorDate: Wed Apr 19 09:06:09 2017 +0200

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

 doc/man/gnunet-datastore.1                |  24 +-
 src/datastore/gnunet-datastore.c          | 452 +++++++++++++++++++++++-------
 src/datastore/gnunet-service-datastore.c  | 274 ++++--------------
 src/datastore/perf_plugin_datastore.c     |  13 +-
 src/datastore/plugin_datastore_heap.c     | 372 ++++++++++++++++--------
 src/datastore/plugin_datastore_mysql.c    | 336 ++++++++++------------
 src/datastore/plugin_datastore_postgres.c | 219 +++++++++------
 src/datastore/plugin_datastore_sqlite.c   | 259 ++++++++++-------
 src/datastore/plugin_datastore_template.c |  88 +++---
 src/datastore/test_plugin_datastore.c     |  76 +++--
 src/include/gnunet_datastore_plugin.h     | 112 ++++----
 src/include/gnunet_json_lib.h             |  11 +
 src/json/json_helper.c                    |  77 +++++
 13 files changed, 1344 insertions(+), 969 deletions(-)

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