Merge "Revert "docs: userguide ipmi instructions""
authorMaryam Tahhan <maryam.tahhan@intel.com>
Tue, 31 Jan 2017 23:51:48 +0000 (23:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 31 Jan 2017 23:51:48 +0000 (23:51 +0000)
1  2 
docs/userguide/collectd.userguide.rst

Simple merge