Merge pull request #774 from trenkel/master
[collectd.git] / src / utils_format_json.c
2014-09-23 Florian ForsterMerge remote-tracking branch 'github/pr/697'
2014-09-23 Florian ForsterMerge remote-tracking branch 'github/pr/734'
2014-09-20 Florian Forstercommon.[ch]: Move escape_string() to here.
2014-09-08 Marc FournierMerge branch 'collectd-5.4'
2014-09-08 Marc FournierMerge remote-tracking branch 'origin/pr/691'
2014-09-08 Florian ForsterMerge branch 'pr-713'
2014-09-06 Florian ForsterMerge branch 'collectd-5.4'
2014-09-06 Florian ForsterMerge branch 'collectd-5.3' into collectd-5.4
2014-09-02 Florian ForsterMerge remote-tracking branch 'github/collectd-5.3'...
2014-09-02 Florian Forstersrc/utils_format_json.c: Handle empty meta_data_t grace...
2014-08-22 Marc FournierMerge branch 'feature/ZOL'
2014-08-18 Florian ForsterMerge branch 'collectd-5.4'
2014-08-18 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.3
2014-08-08 Marc FournierMerge remote-tracking branch 'origin/pr/603'
2014-08-07 Marc FournierMerge pull request #566 from timl/drbd
2014-07-31 Pierre-Yves RitschardMerge pull request #312 from jazzmes/libvirt-mem-usage
2014-07-30 Pierre-Yves RitschardMerge pull request #654 from timl/fix_ttl_order
2014-07-30 Pierre-Yves RitschardMerge pull request #662 from komeda-shinji/fix-config...
2014-07-29 Pierre-Yves RitschardMerge pull request #673 from deferraz/master
2014-07-29 Pierre-Yves RitschardMerge pull request #264 from ChrisLundquist/cl/perl...
2014-07-29 Pierre-Yves RitschardMerge pull request #313 from tiwilliam/master
2014-07-29 Florian ForsterMerge remote-tracking branch 'github/pr/682'
2014-07-29 Florian Forster{GPL, other}: Relicense to MIT license.
2014-01-23 Marc FournierMerge remote-tracking branch 'origin/collectd-4.10...
2014-01-08 Marc FournierMerge branch 'collectd-4.10' into collectd-5.3
2013-05-30 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.2
2013-05-25 Florian ForsterMerge branch 'document-varnish-instance-block' into...
2013-04-09 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-04-09 Florian ForsterMerge remote-tracking branch 'origin/collectd-4.10...
2013-04-07 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-04-07 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-04-07 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.1
2013-03-29 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-03-23 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-03-16 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-03-16 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.1
2013-02-03 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-02-03 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.1
2013-01-25 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-01-14 Florian ForsterMerge branch 'collectd-5.1' into collectd-5.2
2013-01-14 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.1
2012-11-17 Florian ForsterMerge branch 'collectd-5.1'
2012-11-17 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0 collectd-5.0
2012-11-17 Florian ForsterMerge branch 'sh/postgresql-writer'
2012-11-17 Florian ForsterMerge branch 'ff/netlib'
2012-11-16 Florian ForsterMerge branch 'sh/plugin_interval'
2012-11-12 Florian ForsterMerge branch 'collectd-5.1'
2012-11-11 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-11-11 Florian ForsterMerge branch 'ff/aggregate'
2012-11-10 Florian ForsterMerge remote-tracking branch 'github-tokkee/sh/empty...
2012-10-18 Florian ForsterMerge branch 'collectd-5.1'
2012-10-18 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-10-11 Florian ForsterMerge branch 'collectd-5.1'
2012-10-11 Florian ForsterMerge branch 'collectd-5.1'
2012-10-11 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-09-23 Florian ForsterMerge branch 'collectd-5.1'
2012-09-23 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-09-13 Florian ForsterMerge branch 'master' into sr/pf
2012-09-07 Florian ForsterMerge branch 'collectd-5.1'
2012-09-07 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-08-27 Florian ForsterMerge branch 'ms/tcpconns'
2012-08-23 Florian Forstersrc/utils_format_json.c: Remove unused arguments.
2012-07-06 Florian Forstersrc/utils_format_json.c: Various fixes for the meta...
2012-07-05 Mark Wongannotate meta data to json objects
2012-04-01 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0 collectd-5.0.4
2012-04-01 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-02-25 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-02-19 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-02-03 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-02-02 Florian ForsterMerge branch 'import/ss/graphite' into ss/graphite
2012-01-28 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2012-01-28 Florian ForsterMerge remote-tracking branch 'tokkee/sh/collectd-5...
2012-01-21 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0 collectd-5.0.2
2012-01-21 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-10-14 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-10-07 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-09-02 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-08-21 Florian ForsterMerge branch 'collectd-5.0'
2011-08-21 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-07-07 Florian Forstersrc/utils_format_json.c: Correctly format the time...
2011-03-26 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-03-26 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2011-03-14 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-03-14 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2011-02-07 Florian ForsterMerge branch 'collectd-4.10' into collectd-5.0
2011-02-07 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2011-02-07 Florian ForsterMerge branch 'pw/exclude_regex'
2011-01-04 Florian ForsterMerge branch 'collectd-4.10'
2011-01-04 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-12-06 Florian ForsterMerge branch 'collectd-4.10'
2010-12-06 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-11-27 Florian ForsterMerge branch 'collectd-4.10'
2010-11-27 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-11-17 Florian ForsterMerge branch 'ff/highres'
2010-11-06 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-11-03 Florian ForsterMany plugins and files: Convert "interval_g" and "vl...
2010-08-19 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-08-17 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-07-09 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
2010-06-13 Florian ForsterMerge branch 'collectd-4.9' into collectd-4.10
next