[shorewall/f14: 3/3] Merge branch 'f15' into f14
Jonathan G. Underwood
jgu at fedoraproject.org
Wed Sep 28 20:02:48 UTC 2011
commit fd5d6612b33acd9e108335c712101be7eb385000
Merge: a4a0490 bc83a1d
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Wed Sep 28 21:02:17 2011 +0100
Merge branch 'f15' into f14
.gitignore | 5 ++
shorewall-foo-init.sh | 112 ----------------------------------------
shorewall-init.patch | 30 +++++++++++
shorewall-init.sh | 121 --------------------------------------------
shorewall-lite-init.patch | 38 ++++++++++++++
shorewall-lite.service | 16 ------
shorewall.service | 16 ------
shorewall.spec | 45 +++++++----------
shorewall6-init.patch | 38 ++++++++++++++
shorewall6-lite-init.patch | 38 ++++++++++++++
shorewall6-lite.service | 16 ------
shorewall6.service | 16 ------
sources | 10 ++--
13 files changed, 172 insertions(+), 329 deletions(-)
---
More information about the scm-commits
mailing list