Fix merge conflicts
[collectd.git] / src / smart.c
2019-09-04 Andrew BaysFix merge conflicts
2019-09-04 Matthias RungeMerge pull request #2624 from abays/sysevent
2019-07-23 Matthias RungeMerge pull request #3207 from dago/cppflagsbugs
2019-07-12 sranga4Merge pull request #3153 from zebity/master
2019-07-12 Zebity SpringMerge remote-tracking branch 'upstream/master'
2019-07-05 Pavel RochnyakMerge branch 'master' into master
2019-07-01 Matthias RungeMerge pull request #2725 from RafaelMarinheiro/fix_grpc...
2019-06-03 Zebity SpringMerge remote-tracking branch 'upstream/master'
2019-05-16 Zebity SpringRun all changed files 68 8.c/1*.h through clang-format
2019-05-16 Zebity SpringMerge remote-tracking branch 'upstream/master'
2019-05-15 Pavel RochnyakMerge pull request #2986 from shastah/feature/curl...
2019-05-13 Zebity SpringAdd snprintf wrapper for GCC 8.2/3
2019-04-29 usev6Update to resolve conflicts due to renamed files
2019-03-07 Pavel RochnyakMerge pull request #2874 from elfiesmelfie/feat_virt_bl...
2019-02-20 Florian ForsterMerge branch 'collectd-5.8'
2019-02-20 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2019-02-20 Ruben KerkhofMerge pull request #3060 from octo/issue/2973
2019-02-19 Florian ForsterMerge pull request #3074 from mfournier/ci-setup
2019-02-12 Matthias RungeMerge pull request #3061 from octo/docs
2019-02-12 Ruben KerkhofMerge pull request #3055 from dfandrich/travis
2019-02-12 Ruben KerkhofMerge pull request #3021 from rubenk/libcollectdclient...
2019-02-12 Florian ForsterMerge pull request #2961 from octo/ff/utils
2019-02-11 Florian ForsterTree wide: Move utilities and libraries to src/utils/.
2019-02-10 Florian ForsterMerge branch 'collectd-5.8'
2019-02-10 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2018-11-06 Andrew BaysMerge branch 'master' into sysevent
2018-10-26 Pavel RochnyackMerge branch 'collectd-5.8' into master
2018-10-26 Pavel RochnyackMerge branch 'collectd-5.7' into collectd-5.8
2018-10-22 Andrew BaysMerge branch 'master' into procevent
2018-10-18 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2018-10-08 Florian ForsterMerge branch 'collectd-5.8'
2018-10-08 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2018-09-05 Ruben KerkhofMerge branch 'collectd-5.8'
2018-07-10 Pavel RochnyackMerge branch 'collectd-5.8' into collectd-master
2018-07-08 Pavel RochnyackMerge branch 'collectd-5.8' into master
2018-07-02 kevin-laatz-intelMerge branch 'master' into fix_deprecated_func
2018-06-26 Ruben KerkhofMerge pull request #2837 from abays/fix-collectd-tg...
2018-05-24 Pavel RochnyackMerge pull request #2729 from cekstam/add-scale-and...
2018-05-24 Pavel RochnyakMerge pull request #2670 from antvick/feature/modbus_64bit
2018-05-24 Ruben KerkhofMerge pull request #2618 from ajssmith/amqp1_dev1_branch
2018-05-23 Pavel RochnyackMerge branch 'collectd-5.8' into master
2018-05-20 Pavel RochnyackMerge branch 'collectd-5.8'
2018-05-20 Pavel RochnyackMerge branch 'collectd-5.8'
2018-05-18 Ruben KerkhofMerge pull request #2701 from elfiesmelfie/feat_virt_no...
2018-05-16 Ruben KerkhofMerge branch 'collectd-5.8'
2018-05-15 Ruben KerkhofMerge branch 'collectd-5.8'
2018-05-15 Marc FournierMerge pull request #2776 from mfournier/unblock_pr_2737
2018-05-14 Ruben KerkhofMerge pull request #2772 from rubenk/static-initializers
2018-05-14 Ruben KerkhofDon't initialize static numeric variables to 0
2018-05-14 Ruben KerkhofDon't initialize static pointers to NULL
2018-04-03 Ruben KerkhofMerge pull request #2045 from rubenk/fix-readme
2018-03-30 Pavel RochnyackMerge branch 'collectd-5.7' into collectd-5.8
2018-02-19 Ruben KerkhofMerge branch 'collectd-5.7' into collectd-5.8
2018-02-10 Pavel RochnyakMerge pull request #2613 from elfiesmelfie/update_dpdk_note
2017-12-07 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-12-04 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-11-30 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-11-21 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-11-18 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-11-17 Florian ForsterMerge branch 'collectd-5.7' into collectd-5.8
2017-11-14 Marc FournierMerge branch 'collectd-5.7' into collectd-5.8
2017-11-06 Marc FournierMerge branch 'collectd-5.7' into collectd-5.8
2017-10-20 Pavel RochnyackMerge branch 'collectd-5.7'
2017-10-20 Pavel RochnyackMerge branch 'collectd-5.6' into collectd-5.7
2017-10-18 Pavel RochnyakMerge pull request #2485 from rpv-tomsk/processes
2017-10-11 Florian ForsterMerge remote-tracking branch 'github/pr/2135'
2017-10-06 Florian ForsterMerge remote-tracking branch 'github/pr/2091'
2017-10-06 Florian ForsterMerge branch 'collectd-5.7'
2017-10-06 Florian ForsterMerge branch 'collectd-5.6' into collectd-5.7
2017-09-29 Florian ForsterMerge branch 'collectd-5.7'
2017-09-29 Florian ForsterMerge branch 'collectd-5.6' into collectd-5.7
2017-09-29 Florian ForsterMerge remote-tracking branch 'github/pr/1707'
2017-09-29 Florian ForsterMerge remote-tracking branch 'github/pr/1681'
2017-09-21 Florian ForsterMerge branch 'collectd-5.7'
2017-09-21 Florian ForsterMerge branch 'collectd-5.6' into collectd-5.7
2017-09-18 Florian ForsterMerge branch 'collectd-5.7'
2017-08-30 Florian ForsterMerge remote-tracking branch 'github/pr/2258'
2017-07-27 Florian ForsterMerge pull request #2378 from cramertj/grpc-meta
2017-07-24 Florian ForsterMerge pull request #2246 from maryamtahhan/feat_mcelog_...
2017-07-20 Florian ForsterMerge branch 'collectd-5.7'
2017-07-20 Florian ForsterMerge branch 'collectd-5.6' into collectd-5.7
2017-07-20 Florian ForsterMerge pull request #2232 from rpv-tomsk/processes
2017-07-19 Florian ForsterMerge remote-tracking branch 'github/pr/2276'
2017-07-16 Sven TrenkelMerge remote-tracking branch 'octo/master'
2017-07-16 Ruben KerkhofMerge branch 'ssnprintf-cleanup'
2017-07-16 Ruben KerkhofRun clang-format after removing ssnprintf
2017-07-14 Roman KorynkevychMerge branch 'master' into feat_mcelog_notification_bug...
2017-07-12 Ruben KerkhofMerge branch 'collectd-5.7'
2017-07-12 Ruben KerkhofMerge branch 'collectd-5.6' into collectd-5.7
2017-07-07 Ruben KerkhofMerge branch 'collectd-5.7'
2017-07-07 Ruben KerkhofMerge branch 'collectd-5.6' into collectd-5.7
2017-07-02 Ruben KerkhofTreewide: replace ssnprintf with snprintf
2017-07-02 Ruben KerkhofMerge branch 'collectd-5.7'
2017-06-30 Ruben KerkhofMerge branch 'collectd-5.7'
2017-06-30 Ruben KerkhofMerge branch 'collectd-5.6' into collectd-5.7
2017-06-06 Ruben KerkhofMerge branch 'collectd-5.7'
2017-06-01 Ruben KerkhofMerge branch 'collectd-5.7'
2017-06-01 Ruben KerkhofMerge branch 'collectd-5.6' into collectd-5.7
2017-05-19 Florian ForsterMerge remote-tracking branch 'github/pr/2285'
2017-05-18 Ruben KerkhofMerge pull request #2287 from BrandonArp/fix_am_1_11
next