Update fluentd-es to collect etcd logs and remove merge conflict cruft.

2015-07-30 21:41:58 +00:00
parent 9e18c29e9f
commit 69ab7026af
3 changed files with 9 additions and 16 deletions
--- a/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+++ b/cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
  containers:
  - name: fluentd-elasticsearch
-    image: gcr.io/google_containers/fluentd-elasticsearch:1.6
+    image: gcr.io/google_containers/fluentd-elasticsearch:1.7
    resources:
      limits:
        cpu: 100m