fixes merge conflict

DataDog · Feb 13, 2017 · a91cc35 · a91cc35
1 parent b2ca61e
commit a91cc35
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/conf.d/riak.yaml.example b/conf.d/riak.yaml.example
@@ -2,7 +2,9 @@ init_config:
 
 instances:
   - url: http://127.0.0.1:8098/stats
-  - min_collection_interval: 60
+    min_collection_interval: 60
+    # cacert: /path/to/ca.pem
+    # disable_cert_verify: false
     # tags:
     #  - optional_tag1
     #  - optional_tag2