diff options
| author | Bob Gilligan <gilligan@sydney.vyatta.com> | 2007-12-19 10:56:59 -0800 |
|---|---|---|
| committer | Bob Gilligan <gilligan@sydney.vyatta.com> | 2007-12-19 10:56:59 -0800 |
| commit | 8e9001366f04fc3eb695e0368ef894bd3d21e958 (patch) | |
| tree | d35e1ff6fa3e2b0dfd20fd28eb79bf1c9f7be119 | |
| parent | 61859f29718a8f87be9c0b2d020006daeeefb7eb (diff) | |
| parent | d10a11cf953a2183a5a9bffc5669ff4f5a36c0fe (diff) | |
| download | vyatta-cfg-firewall-8e9001366f04fc3eb695e0368ef894bd3d21e958.tar.gz vyatta-cfg-firewall-8e9001366f04fc3eb695e0368ef894bd3d21e958.zip | |
Merge branch 'master' of git:/git/vyatta-cfg-firewallupstream
Conflicts:
ChangeLog
| -rw-r--r-- | .gitignore | 19 | ||||
| -rw-r--r-- | ChangeLog | 41 |
2 files changed, 19 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..24ee357 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +*~ +.*.swp +/aclocal.m4 +/autom4te.cache +/build-stamp +/ChangeLog +/config +/config.log +/config.guess +/config.status +/config.sub +/configure +/debian/files +/debian/vyatta-cfg-firewall.postinst +/debian/vyatta-cfg-firewall +/scripts/firewall/firewall.init +/INSTALL +/Makefile.in +/Makefile diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index f7d2060..0000000 --- a/ChangeLog +++ /dev/null @@ -1,41 +0,0 @@ -2007-12-14 Bob Gilligan <gilligan@sydney.vyatta.com> - - * Makefile.am, scripts/firewall/vyatta-show-firewall.pl: Move - vyatta-show-firewall.pl over to vyatta-op-firewall package. - -2007-12-12 Bob Gilligan <gilligan@sydney.vyatta.com> - - * templates/interfaces/ethernet/node.tag/firewall/in/name/node.def, - templates/interfaces/ethernet/node.tag/firewall/in/node.def, - templates/interfaces/ethernet/node.tag/firewall/local/name/node.def - , templates/interfaces/ethernet/node.tag/firewall/local/node.def, - templates/interfaces/ethernet/node.tag/firewall/node.def, - templates/interfaces/ethernet/node.tag/firewall/out/name/node.def, - templates/interfaces/ethernet/node.tag/firewall/out/node.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/nam - e/node.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/nod - e.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/ - name/node.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/ - node.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/node.d - ef, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/na - me/node.def, - templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/no - de.def: Add templates for firewall nodes in the "interfaces" tree. - -2007-12-10 Bob Gilligan <gilligan@sydney.vyatta.com> - - * ChangeLog, Makefile.am, configure.ac, - debian/vyatta-cfg-firewall.postinst.in, - scripts/firewall/firewall.init, scripts/firewall/firewall.init.in: - Update vyatta-cfg-firewall package. - -2007-12-10 Bob Gilligan <gilligan@sydney.vyatta.com> - - * Initial setup of vyatta-cfg-firewall package. - -git:/git/vyatta-cfg-firewall.git#master-e9d379a3 |