diff options
| author |   TsaLaGi <aasmith@redhat.com> | 2018-02-27 09:17:38 -0500 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-27 16:12:49 +0000 |
| commit | 56199ed429baf2187e9ebd49cbd486df028ebdbb (patch) | |
| tree | f17941658b27cd461621539d9526a5f85af72063 /opnfv-theme/sphinx_opnfv_theme/opnfv/layout.html | |
| parent | dab05bbf1d5b26ad877e13968d1fc709046ebff2 (diff) | |
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 <aasmith@redhat.com>
Diffstat (limited to 'opnfv-theme/sphinx_opnfv_theme/opnfv/layout.html')
0 files changed, 0 insertions, 0 deletions