Merge "Adding the ip_conntrack_proto_sctp kernel module" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Sun, 26 Feb 2017 20:21:08 +0000 (20:21 +0000)
committerGerrit Code Review <review@openstack.org>
Sun, 26 Feb 2017 20:21:08 +0000 (20:21 +0000)

Trivial merge