From: TsaLaGi Date: Tue, 27 Feb 2018 14:17:38 +0000 (-0500) Subject: Update git submodules X-Git-Tag: opnfv-6.0.0~1226 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=56199ed429baf2187e9ebd49cbd486df028ebdbb;p=opnfvdocs.git Update git submodules * Update docs/submodules/barometer from branch 'master' - 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 --- diff --git a/docs/submodules/barometer b/docs/submodules/barometer index 7effd9e1e..7f4ef61d6 160000 --- a/docs/submodules/barometer +++ b/docs/submodules/barometer @@ -1 +1 @@ -Subproject commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a +Subproject commit 7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5