resolve conflict between cms network rules and default rules
authorHarald Hoyer <harald@redhat.com>
Tue, 12 Jun 2012 12:40:43 +0000 (14:40 +0200)
committerHarald Hoyer <harald@redhat.com>
Fri, 15 Jun 2012 09:56:13 +0000 (11:56 +0200)
commit8fab6e0463e0b0c70327c2733911098aa56137a7
treebdc0412f857f278154541cf528e7446e05ccf4c8
parentc9aa3cc950ebec597e51cbc0899777c2a99ca276
resolve conflict between cms network rules and default rules
modules.d/40network/net-genrules.sh
modules.d/80cms/cmssetup.sh