Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit f061452 Merge: db96537 fd5ab55 Author: Morgan Haskel <[email protected]> Date: Tue Oct 28 12:52:03 2014 -0400 Merge pull request #405 from cdenneen/master EL7 Fixes for CentOS commit fd5ab55 Merge: 653bb02 ed5dd3e Author: cdenneen <[email protected]> Date: Mon Oct 27 21:23:59 2014 -0400 Merge pull request #1 from cmurphy/fix_el7_tests Update tests for EL 7 commit ed5dd3e Author: Colleen Murphy <[email protected]> Date: Mon Oct 27 13:36:46 2014 -0700 Update tests for EL 7 Without this patch, unit tests make no distinction between EL < 7 and EL 7. This is a problem because the iptables save exec is different between the two operating systems, so the tests will fail for EL 7. This patch fixes the problem by updating the tests to include the new exec command for EL 7. commit db96537 Merge: 4ed1b43 1247c22 Author: Colleen Murphy <[email protected]> Date: Fri Oct 24 14:23:24 2014 -0700 Merge pull request #424 from mhaskel/purge_ip6_fix Missing a provider specification commit 4ed1b43 Merge: dfb5e54 e7f9a38 Author: Hunter Haugen <[email protected]> Date: Thu Oct 23 15:15:45 2014 -0700 Merge pull request #383 from vzctl/ipset add ipset support commit 1247c22 Author: Morgan Haskel <[email protected]> Date: Thu Oct 23 10:31:57 2014 -0600 Missing a provider specification commit dfb5e54 Merge: d2addf1 f7652f3 Author: Hunter Haugen <[email protected]> Date: Wed Oct 22 10:44:38 2014 -0700 Merge pull request #423 from mhaskel/metadata_fix Invalid metadata commit f7652f3 Author: Morgan Haskel <[email protected]> Date: Wed Oct 22 10:43:27 2014 -0700 Invalid metadata commit d2addf1 Merge: f157da0 6cafec4 Author: Morgan Haskel <[email protected]> Date: Mon Oct 20 14:01:29 2014 -0700 Merge pull request #422 from hunner/fix_instances (MODULES-41) Change source for ip6tables provider commit 6cafec4 Author: Hunter Haugen <[email protected]> Date: Mon Oct 20 13:33:36 2014 -0700 (MODULES-41) Change source for ip6tables provider This will allow purging of ipv6 rules commit f157da0 Merge: 1417eef 8846341 Author: Hunter Haugen <[email protected]> Date: Mon Oct 20 09:56:47 2014 -0700 Merge pull request #420 from mhaskel/metadata_update Update to support PE3.x commit 1417eef Merge: 3658a85 5b5f923 Author: Hunter Haugen <[email protected]> Date: Mon Oct 20 09:56:39 2014 -0700 Merge pull request #419 from mhaskel/future_parser Fix for future parser commit e7f9a38 Author: Alexey Lapitsky <[email protected]> Date: Fri Sep 19 15:39:22 2014 -0400 add more ipset documentation commit e55d4ec Author: Alexey Lapitsky <[email protected]> Date: Fri Sep 19 15:19:49 2014 -0400 add negation support for ipset commit 52d8287 Author: Patrick Hemmer <[email protected]> Date: Sat Apr 26 12:13:59 2014 -0400 add ipset support commit 8846341 Author: Morgan Haskel <[email protected]> Date: Sat Oct 18 17:22:03 2014 -0700 Update to support PE3.x commit 5b5f923 Author: Morgan Haskel <[email protected]> Date: Sat Oct 18 17:08:41 2014 -0700 Fix for future parser I'm not entirely sure why this was having issues with the future parser, but there was something funny with the pp function. commit 3658a85 Merge: 91570b4 df4ed1b Author: Hunter Haugen <[email protected]> Date: Fri Oct 17 14:22:22 2014 -0700 Merge pull request #418 from mhaskel/remove_oel5 Doesn't actually support OEL5 commit df4ed1b Author: Morgan Haskel <[email protected]> Date: Fri Oct 17 14:15:37 2014 -0700 Doesn't actually support OEL5 There are weird interactions between the version of iptables and the kernel on OEL5. commit 91570b4 Merge: de7d781 b65afaf Author: Morgan Haskel <[email protected]> Date: Fri Oct 17 10:26:21 2014 -0700 Merge pull request #417 from jbondpdx/fix-readme DOCUMENT-75: cstate param in my_fw::pre example should be state commit b65afaf Author: jbondpdx <[email protected]> Date: Fri Oct 17 10:20:39 2014 -0700 DOCUMENT-75: cstate param in my_fw::pre example should be state Fixed! commit de7d781 Merge: 903a3a0 244f3f6 Author: Hunter Haugen <[email protected]> Date: Thu Oct 16 16:38:29 2014 -0700 Merge pull request #416 from mhaskel/selinux_fixes Don't do the idempotency checks with selinux commit 244f3f6 Author: Morgan Haskel <[email protected]> Date: Thu Oct 16 16:21:47 2014 -0700 Don't do the idempotency checks with selinux Eventually the types should use autobefore, but until then, just don't do the idempotency checks. commit 903a3a0 Merge: 00f6b5d 302f5ae Author: Hunter Haugen <[email protected]> Date: Tue Oct 14 11:56:42 2014 -0700 Merge pull request #414 from mhaskel/spec_helper_fix Use puppet() so the module install works better commit 302f5ae Author: Morgan Haskel <[email protected]> Date: Tue Oct 14 11:53:23 2014 -0700 Use puppet() so the module install works better This was failing on SLES10 due to path issues. commit 00f6b5d Merge: 2b38d12 3f297ae Author: Travis Fields <[email protected]> Date: Mon Oct 13 20:02:26 2014 -0700 Merge pull request #413 from mhaskel/rhel5_fixes Fix for RHEL5 commit 3f297ae Author: Morgan Haskel <[email protected]> Date: Mon Oct 13 16:54:01 2014 -0700 Fix for RHEL5 iptables-save output is in a different order for RHEL5 systems. Make the tests check that ordering. commit 2b38d12 Merge: 955024e 473fffe Author: Colleen Murphy <[email protected]> Date: Thu Oct 9 16:16:56 2014 -0700 Merge pull request #412 from mhaskel/resource_cmd_spec_fix Fix for resource_cmd_spec commit 473fffe Author: Morgan Haskel <[email protected]> Date: Thu Oct 9 19:03:16 2014 -0400 Fix for resource_cmd_spec Was checking for empty stderr in a few places, and also setting an iptables rule that doesn't work on deb7 and ubuntu trusty. commit 955024e Merge: e8dca83 b79c277 Author: Morgan Haskel <[email protected]> Date: Mon Sep 29 14:18:51 2014 -0500 Merge pull request #410 from justinstoller/bug/master/FM-1923-fixup-hieraconf (FM-1923) Fix spec_helper_acceptance to run against PE commit b79c277 Author: Justin Stoller <[email protected]> Date: Mon Sep 29 12:16:10 2014 -0700 (FM-1923) Fix spec_helper_acceptance to run against PE commit e8dca83 Merge: 2df558c a626cf2 Author: Travis Fields <[email protected]> Date: Wed Sep 17 09:05:24 2014 -0700 Merge pull request #407 from hunner/redirect_validate (MODULES-1086) toports is not reqired with jump == REDIRECT commit a626cf2 Author: Hunter Haugen <[email protected]> Date: Mon Sep 15 16:20:09 2014 -0700 (MODULES-1086) toports is not reqired with jump == REDIRECT From the man page for REDIRECT and --to-ports: "This specifies a destination port or range of ports to use: without this, the destination port is never altered." commit 2df558c Merge: d5a10f5 1c7d88b Author: Hunter Haugen <[email protected]> Date: Wed Sep 10 11:50:04 2014 -0700 Merge pull request #406 from cyberious/master Remove puppet_module_install in favor of copy_module_to commit 1c7d88b Author: Travis Fields <[email protected]> Date: Wed Sep 10 11:47:53 2014 -0700 Remove puppet_module_install in favor of copy_module_to commit 653bb02 Author: cdenneen <[email protected]> Date: Wed Sep 3 22:42:19 2014 -0400 Update redhat.pp commit af94f65 Author: cdenneen <[email protected]> Date: Wed Sep 3 22:23:57 2014 -0400 Update firewall.rb commit 4563e2d Author: cdenneen <[email protected]> Date: Wed Sep 3 13:14:06 2014 -0400 Centos 7 won't work with operatingsystemrelease 7.0 Centos 7 operatingsystemrelease is 7.0.1406 for example so switching to operatingsystemmajrelease would allow for 7 to be used for all EL7 products commit 0d40289 Author: cdenneen <[email protected]> Date: Wed Sep 3 13:08:17 2014 -0400 Add CentOS to facter value operatingsystem test
- Loading branch information
