Merge "Ignore failures when loading nf_conntrack_proto_sctp kernel module"
authorJenkins <jenkins@review.openstack.org>
Wed, 21 Jun 2017 16:21:26 +0000 (16:21 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 21 Jun 2017 16:21:26 +0000 (16:21 +0000)

Trivial merge