summaryrefslogtreecommitdiffstats
path: root/docker/barometer-kafka/Dockerfile
diff options
context:
space:
mode:
authorTsaLaGi <aasmith@redhat.com>2018-02-27 09:17:38 -0500
committerTsaLaGi <aasmith@redhat.com>2018-02-27 10:35:11 -0500
commit7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5 (patch)
tree0f70462600336e92217628496da2ac8d09a3134c /docker/barometer-kafka/Dockerfile
parent7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a (diff)
Merge conflict
Revert "Merge "ansible: add ansible scripts to configure .conf file on collectd nodes"" This reverts commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a, reversing changes made to b26034d05aa81f624e9bcee2c8e82a1cacfe44c4. Change-Id: I6f77b4432bbe0de29db3e099263e461e3043b22e Signed-off-by: TsaLaGi <aasmith@redhat.com>
Diffstat (limited to 'docker/barometer-kafka/Dockerfile')
0 files changed, 0 insertions, 0 deletions