Merge branch 'production' of github.com:jeroen92/collectd-formula int…

…o production
saltstack-formulas · Oct 13, 2018 · d45f7f8 · d45f7f8
2 parents e280c0a + 781f179
commit d45f7f8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/collectd/map.jinja b/collectd/map.jinja
@@ -159,8 +159,8 @@
             },
             'swap': {
                 'ValuesAbsolute': 'true',
-                'ValuesPercentage': 'false'
-                'ReportByDevice': 'false'
+                'ValuesPercentage': 'false',
+                'ReportByDevice': 'false',
                 'ReportBytes': 'false'
             },
             'syslog': {
@@ -209,6 +209,7 @@
               'local_ports': [],
               'remote_ports': [],
               'all_ports_summary': 'false'
+<<<<<<< HEAD
             },
             'unixsock': {
               'socket_file': '/var/run/collectd.socket',
@@ -218,6 +219,8 @@
             },
             'vmem': {
               'verbose': 'false'
+=======
+>>>>>>> 781f1792f95faf9faf6a8f203d117005da229de2
             },
             'openvpn': {
               'status_file': [