Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true #126

Closed
wants to merge 1 commit into from
Closed

Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true #126

wants to merge 1 commit into from

Conversation

imcsk8
Copy link
Contributor

@imcsk8 imcsk8 commented Oct 17, 2014

Currently if one tries to enable SSL for AMQP via rabbit_use_ssl in the
puppet-neutron module it fails if the kombu_* options aren't also set.

Fixes: rhbz#1146136

Currently if one tries to enable SSL for AMQP via rabbit_use_ssl in the
puppet-neutron module it fails if the kombu_* options aren't also set.

Fixes: rhbz#1146136
@paramite
Copy link
Member

Ivan, following info pretty much simplifies checking the PR. Please in future don't forget to add that info:
[para@sanitarium puppet-neutron]$ git log --oneline --no-merges 0a7e0f1..141e65a
141e65a Makes kombu_ssl_* parameters optional when rabbit_use_ssl => true
7d20fc9 Add ability to manage Neutron ML2 plugin package state
48aa3fb New manifest file to deploy Cisco N1KV-VEM
c848aff Add plugin config file to /etc/default/neutron-server
70ef4af Makes ca_file parameter optional when use_ssl => true
c7f8696 Hide secrets from puppet logs
3848a2b minor fixes for cisco nexus ml2 plugin
c40f300 Make Nova_admin_tenant_id_setter notify neutron-server.
3820c41 Use 2.2 as the default mysql_module
8d488fb agent/lbaas: fix HAproxy package relationship
4ab8a0e Rename QUOTAS section for quotas
bddd060 Add linuxbridge mechanism support for ML2 plugin
0346d48 Add ability to configure dhcp_agent_notification
2da560c Add network_device_mtu to neutron.conf
5b3abcf Undeprecate enable_security_group parameter
064899b for OVS agent, fix dependency on service
c4e4818 Install neutron-plugin-ml2 package on Ubuntu
a6102c0 Add vpnaas_agent_package parameter to FWaaS
763ec35 Simplify ml2_config.ini symlink resource management
837e27c Make Modulefile summary and description consistent
68ddc7a Support for Cisco ML2 Mech Driver
cfd0abb ml2: fix neutron-server restart
d59bf66 nova-notifs: allow to use secure keystone endpoint
a28f734 Link from ovs config file to plugin.ini on RedHat
3379806 Normalize Gemfile & pin tests to rspec < 2.99
d1235d7 Add multi-region support
b3203f6 Refresh Neutron server
dd301f6 Pin tests to rspec < 2.99
5d953a4 stop puppet from breaking neutron
069d086 Configure OVS Agent when using ML2 plugin
1055a12 Set default metadata backlog to 4096
40f98ee Fix puppet-neutron rspec test for RSpec >= 3.0.0
d202e4b Added '' as a valid value for gateway_ip
3b6abf0 Add parameter to set veth MTU
f48ce94 Enable neutron server to be run in SSL mode
f1ae25a SSL for communication between neutron and rabbitmq

@paramite
Copy link
Member

Note that this commit moves our icehouse branch out of upstream stable/icehouse to upstream master. We should stick with upstream stable/icehouse. Please create new PR with correct update.

@paramite paramite closed this Oct 17, 2014
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Dec 2, 2014
19ddca4 Merge pull request redhat-openstack#134 from johnsyweb/less-restrictive-setting-names
792d35c Merge pull request redhat-openstack#135 from johnsyweb/The-Puppet-Labs-Issue-Tracker-has-Moved
d2d9ed9 Merge pull request redhat-openstack#136 from mhaskel/merge_1.2.x
927d879 The Puppet Labs Issue Tracker has Moved
3e46c13 Fix Ruby 1.9.3 build
efeb174 Add spec for redhat-openstack#123
c6dcad2 Simplify COMMENTED_SETTING_REGEX to match SETTING_REGEX
e65be6f Simplify SECTION_REGEX
d98e9bc Add failing spec for KDE Configuration with braces in setting names
91c1708 Merge pull request redhat-openstack#133 from mhaskel/1.2.0-prep
5bc9ebc 1.2.0 prep
3f4ad49 Merge pull request redhat-openstack#126 from huan/master
12a4271 Merge pull request redhat-openstack#132 from mhaskel/test
8db122c Merge pull request redhat-openstack#124 from cmurphy/master
d5164a9 Merge pull request redhat-openstack#130 from jbondpdx/update-readme
4e3f602 DOC-1100: old inifile causes agent run failure in PE 3.3
db28fa2 Merge pull request redhat-openstack#128 from mhaskel/1.1.4-prep
3d3a2cf 1.1.4-prep
58883cd Merge pull request redhat-openstack#127 from mhaskel/1.1.x-merged-into-master
8621dfe Merge remote-tracking branch 'upstream/1.1.x' into test
f343c41 modify test to compare to a hash which better tests the state of each setting also update @@COMMENTED_SETTING_REGEX to be roughly equal to "(\s*)[#;]+" + @@SETTING_REGEX
681f5c0 fix issue where single characters settings were not being saved.
8aeddc8 Merge pull request redhat-openstack#125 from mhaskel/spec_updates
7f54eb1 Update spec_helper for consistency.
90f88ec Merge pull request redhat-openstack#122 from jbondpdx/new-readme
c916aca Synchronize with modulesync
4c94689 Docs: fixed code formatting
9f9e1d4 Docs: New inifile readme
41e2ddb Merge pull request redhat-openstack#121 from apenney/113-release
62434bb Prepare a 1.1.3 release.
0e8abb9 Merge pull request redhat-openstack#120 from mhaskel/1.1.2-prep
33147cb 1.1.2-prep.
d6335f5 Merge pull request redhat-openstack#119 from hunner/release_1.1.1
f08a394 Release 1.1.1
09b574e Merge pull request redhat-openstack#115 from johnsyweb/handle-quotation-marks-in-section-names
07c4827 Merge remote-tracking branch 'puppetlabs/master' into temp
b3fed85 Spec for MODULES-1194
069aa56 Merge remote-tracking branch 'origin/master' into handle-quotation-marks-in-section-names
586207b Merge pull request redhat-openstack#118 from cmurphy/master
6b21db8 Add validate and lint tasks to travis script
7a5f54d Merge pull request redhat-openstack#117 from cmurphy/master
d7f0353 Update Gemfile for .travis.yml defaults
bd99244 Test allowing $ signs in section names
3a4bfb9 Synchronize .travis.yml
2a77caf Update .sync.yml to support new .travis.yml configs
281d2f9 Merge pull request redhat-openstack#114 from cmurphy/master
cabc678 Merge branch 'deprecation-warnings' into handle-quotation-marks-in-section-names
49960e1 Handle quotation marks in section names
41fc8bf Failing spec to describe my problem
961447d `be_true` and `be_false` are deprecated
2696725 Sync files
e346825 Add configuration file for modulesync
65d50f5 Merge pull request redhat-openstack#112 from mhaskel/no_modulefile
8f501f5 Remove the Modulefile, use metadata.json.
5e73e73 Merge pull request redhat-openstack#111 from cyberious/1.1.x
acc9f43 Add windows support and testing nodesets
29ffe09 Merge pull request redhat-openstack#109 from mhaskel/osx-test-fixes
842915d OSX doesn't support the -e flag to echo.
1170a53 Merge pull request redhat-openstack#107 from mhaskel/beaker-rspec-pinning
be5fd63 Require beaker-rspec >= 2.2
37cb6d4 Merge pull request redhat-openstack#106 from apenney/pin-rspec
8ca578c Pin rspec to 2.x.
e21dc0c Merge pull request redhat-openstack#104 from hunner/release_1.1.0
521b287 Release 1.1.0
0b9f9e2 Merge pull request redhat-openstack#101 from hunner/remove_stderr
6fb89f5 Remove stderr checks because of deprecations
6477d20 Merge pull request redhat-openstack#100 from mhaskel/1.1.0-prep
783fa4d Update PE version requirement.
027b7bc Prepare a 1.1.x release.
b366981 Merge pull request redhat-openstack#99 from apenney/typo-fix
a5b34ea Quick typo fix.
d4a2b22 Merge pull request redhat-openstack#95 from mruzicka/feature/master/quote-char-parameter-for-subsetting
6656f02 Merge pull request redhat-openstack#97 from apenney/add-platforms
61203df Add RHEL7 and Ubuntu 14.04 support.
85f00fe Merge pull request redhat-openstack#96 from apenney/10xmerge
e24dd91 Merge branch '1.0.x' into 10xmerge
77854d5 Tests for the quote_char parameter.
560bbc6 Add quote_char parameter to the ini_subsetting resource type
790aa9c Merge pull request redhat-openstack#94 from igalic/igorance
77429f6 be more igorant
8ca8e12 Merge pull request redhat-openstack#90 from apenney/last-minute-metadata-fix
0a92f32 Add missing fields back to work around Puppet bug.
2376e7c Merge pull request redhat-openstack#89 from apenney/102-supported
4021745 Prepare supported module 1.0.3.
0c27288 Merge pull request redhat-openstack#88 from apenney/metadata
6c63184 Add AIX and remove fields copied from Modulefile.
6b0a200 Merge pull request redhat-openstack#87 from laurenrother/1.0.x
f791521 Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
1edd2d5 Merge pull request redhat-openstack#86 from apenney/fix-tmpdir
2aceaef Convert to using .tmpdir instead of a hardcoded /tmp, so this works on Windows too.
ca7e441 Merge pull request redhat-openstack#84 from hunner/grep_sol
eda726f It is actually all solaris
f271580 Merge pull request redhat-openstack#83 from hunner/grep_sol10
7de1e3d Correct syntax
698e632 Merge pull request redhat-openstack#82 from hunner/grep_sol10
49433d0 Avoid multi-line grep on Solaris 10
5ec46f6 Merge pull request redhat-openstack#81 from hunner/release_1.0.2
3757c71 Release 1.0.2
d17dcfb Merge pull request redhat-openstack#80 from hunner/fix_aix
17a59b2 AIX exits with 2 on file doesn't exist.
5e841a9 Merge branch 'missing_comma' into 1.0.x
6999ab0 Fix missing comma in metadata.json
08346e9 Merge pull request redhat-openstack#77 from hunner/add_metadata
5c2cb37 Add supported OS/PE/Puppet
b77ef8d Merge pull request redhat-openstack#78 from hunner/remove_autopublish
f5e607a Remove travis autopublish stuff
c1bc9d0 Merge pull request redhat-openstack#75 from justinstoller/maint/1.0.x/dont_use_hardcoded_modpath
25e7c28 Remove basic spec
48a4e08 Merge pull request redhat-openstack#74 from hunner/release_1.0.1
5b6de57 Release 1.0.1
a0c3b82 Merge pull request redhat-openstack#73 from hunner/dynamic_gemsource
ab21bd3 Allow custom gemsource
467c4c5 Merge pull request redhat-openstack#66 from hunner/update_specs
eda78ab (FM-161) Add beaker tests for parameter coverage
664051c Merge pull request redhat-openstack#70 from ghoneycutt/fix_travis_link_in_readme
4e1bc1e Fix link to travis in README
38f260c Merge pull request redhat-openstack#68 from ghoneycutt/test_puppet_v3_4
17cba2f Merge pull request redhat-openstack#67 from ghoneycutt/enable_travis_fast_finish
4c1d651 Test against Puppet v3.4
9e6b0c4 Enable fast finish in Travis
a0b63eb Merge pull request redhat-openstack#65 from shrug/master
76ad4c4 Fix the regex t fix a bad match
6870dfe Add tests to cover settings with square brackets and quotes in the name
e779d12 Update settings regexes to support settings with "[", "]" in them
ae23a4d Merge pull request redhat-openstack#58 from jnewland/spaces-in-sections
c058ee5 support spaces in sections
2b45293 Merge pull request redhat-openstack#59 from antroy/master
10f270f Merge pull request redhat-openstack#63 from JHaals/master
ff98e78 make ensure => present the first attribute
d75ce1c Merge pull request redhat-openstack#61 from apenney/metadata
cd9bb11 Add empty dependencies section.
85cfc93 FM-103: Add metadata.json to all modules.
0a1dea4 Merge pull request redhat-openstack#60 from apenney/metadata
86c57aa Adding whitespace capability to section header regex
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Dec 2, 2014
19ddca4 Merge pull request redhat-openstack#134 from johnsyweb/less-restrictive-setting-names
792d35c Merge pull request redhat-openstack#135 from johnsyweb/The-Puppet-Labs-Issue-Tracker-has-Moved
d2d9ed9 Merge pull request redhat-openstack#136 from mhaskel/merge_1.2.x
927d879 The Puppet Labs Issue Tracker has Moved
3e46c13 Fix Ruby 1.9.3 build
efeb174 Add spec for redhat-openstack#123
c6dcad2 Simplify COMMENTED_SETTING_REGEX to match SETTING_REGEX
e65be6f Simplify SECTION_REGEX
d98e9bc Add failing spec for KDE Configuration with braces in setting names
91c1708 Merge pull request redhat-openstack#133 from mhaskel/1.2.0-prep
5bc9ebc 1.2.0 prep
3f4ad49 Merge pull request redhat-openstack#126 from huan/master
12a4271 Merge pull request redhat-openstack#132 from mhaskel/test
8db122c Merge pull request redhat-openstack#124 from cmurphy/master
d5164a9 Merge pull request redhat-openstack#130 from jbondpdx/update-readme
4e3f602 DOC-1100: old inifile causes agent run failure in PE 3.3
db28fa2 Merge pull request redhat-openstack#128 from mhaskel/1.1.4-prep
3d3a2cf 1.1.4-prep
58883cd Merge pull request redhat-openstack#127 from mhaskel/1.1.x-merged-into-master
8621dfe Merge remote-tracking branch 'upstream/1.1.x' into test
f343c41 modify test to compare to a hash which better tests the state of each setting also update @@COMMENTED_SETTING_REGEX to be roughly equal to "(\s*)[#;]+" + @@SETTING_REGEX
681f5c0 fix issue where single characters settings were not being saved.
8aeddc8 Merge pull request redhat-openstack#125 from mhaskel/spec_updates
7f54eb1 Update spec_helper for consistency.
90f88ec Merge pull request redhat-openstack#122 from jbondpdx/new-readme
c916aca Synchronize with modulesync
4c94689 Docs: fixed code formatting
9f9e1d4 Docs: New inifile readme
41e2ddb Merge pull request redhat-openstack#121 from apenney/113-release
62434bb Prepare a 1.1.3 release.
0e8abb9 Merge pull request redhat-openstack#120 from mhaskel/1.1.2-prep
33147cb 1.1.2-prep.
d6335f5 Merge pull request redhat-openstack#119 from hunner/release_1.1.1
f08a394 Release 1.1.1
09b574e Merge pull request redhat-openstack#115 from johnsyweb/handle-quotation-marks-in-section-names
07c4827 Merge remote-tracking branch 'puppetlabs/master' into temp
b3fed85 Spec for MODULES-1194
069aa56 Merge remote-tracking branch 'origin/master' into handle-quotation-marks-in-section-names
586207b Merge pull request redhat-openstack#118 from cmurphy/master
6b21db8 Add validate and lint tasks to travis script
7a5f54d Merge pull request redhat-openstack#117 from cmurphy/master
d7f0353 Update Gemfile for .travis.yml defaults
bd99244 Test allowing $ signs in section names
3a4bfb9 Synchronize .travis.yml
2a77caf Update .sync.yml to support new .travis.yml configs
281d2f9 Merge pull request redhat-openstack#114 from cmurphy/master
cabc678 Merge branch 'deprecation-warnings' into handle-quotation-marks-in-section-names
49960e1 Handle quotation marks in section names
41fc8bf Failing spec to describe my problem
961447d `be_true` and `be_false` are deprecated
2696725 Sync files
e346825 Add configuration file for modulesync
65d50f5 Merge pull request redhat-openstack#112 from mhaskel/no_modulefile
8f501f5 Remove the Modulefile, use metadata.json.
5e73e73 Merge pull request redhat-openstack#111 from cyberious/1.1.x
acc9f43 Add windows support and testing nodesets
29ffe09 Merge pull request redhat-openstack#109 from mhaskel/osx-test-fixes
842915d OSX doesn't support the -e flag to echo.
1170a53 Merge pull request redhat-openstack#107 from mhaskel/beaker-rspec-pinning
be5fd63 Require beaker-rspec >= 2.2
37cb6d4 Merge pull request redhat-openstack#106 from apenney/pin-rspec
8ca578c Pin rspec to 2.x.
e21dc0c Merge pull request redhat-openstack#104 from hunner/release_1.1.0
521b287 Release 1.1.0
0b9f9e2 Merge pull request redhat-openstack#101 from hunner/remove_stderr
6fb89f5 Remove stderr checks because of deprecations
6477d20 Merge pull request redhat-openstack#100 from mhaskel/1.1.0-prep
783fa4d Update PE version requirement.
027b7bc Prepare a 1.1.x release.
b366981 Merge pull request redhat-openstack#99 from apenney/typo-fix
a5b34ea Quick typo fix.
d4a2b22 Merge pull request redhat-openstack#95 from mruzicka/feature/master/quote-char-parameter-for-subsetting
6656f02 Merge pull request redhat-openstack#97 from apenney/add-platforms
61203df Add RHEL7 and Ubuntu 14.04 support.
85f00fe Merge pull request redhat-openstack#96 from apenney/10xmerge
e24dd91 Merge branch '1.0.x' into 10xmerge
77854d5 Tests for the quote_char parameter.
560bbc6 Add quote_char parameter to the ini_subsetting resource type
790aa9c Merge pull request redhat-openstack#94 from igalic/igorance
77429f6 be more igorant
8ca8e12 Merge pull request redhat-openstack#90 from apenney/last-minute-metadata-fix
0a92f32 Add missing fields back to work around Puppet bug.
2376e7c Merge pull request redhat-openstack#89 from apenney/102-supported
4021745 Prepare supported module 1.0.3.
0c27288 Merge pull request redhat-openstack#88 from apenney/metadata
6c63184 Add AIX and remove fields copied from Modulefile.
6b0a200 Merge pull request redhat-openstack#87 from laurenrother/1.0.x
f791521 Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
1edd2d5 Merge pull request redhat-openstack#86 from apenney/fix-tmpdir
2aceaef Convert to using .tmpdir instead of a hardcoded /tmp, so this works on Windows too.
ca7e441 Merge pull request redhat-openstack#84 from hunner/grep_sol
eda726f It is actually all solaris
f271580 Merge pull request redhat-openstack#83 from hunner/grep_sol10
7de1e3d Correct syntax
698e632 Merge pull request redhat-openstack#82 from hunner/grep_sol10
49433d0 Avoid multi-line grep on Solaris 10
5ec46f6 Merge pull request redhat-openstack#81 from hunner/release_1.0.2
3757c71 Release 1.0.2
d17dcfb Merge pull request redhat-openstack#80 from hunner/fix_aix
17a59b2 AIX exits with 2 on file doesn't exist.
5e841a9 Merge branch 'missing_comma' into 1.0.x
6999ab0 Fix missing comma in metadata.json
08346e9 Merge pull request redhat-openstack#77 from hunner/add_metadata
5c2cb37 Add supported OS/PE/Puppet
b77ef8d Merge pull request redhat-openstack#78 from hunner/remove_autopublish
f5e607a Remove travis autopublish stuff
c1bc9d0 Merge pull request redhat-openstack#75 from justinstoller/maint/1.0.x/dont_use_hardcoded_modpath
25e7c28 Remove basic spec
48a4e08 Merge pull request redhat-openstack#74 from hunner/release_1.0.1
5b6de57 Release 1.0.1
a0c3b82 Merge pull request redhat-openstack#73 from hunner/dynamic_gemsource
ab21bd3 Allow custom gemsource
467c4c5 Merge pull request redhat-openstack#66 from hunner/update_specs
eda78ab (FM-161) Add beaker tests for parameter coverage
664051c Merge pull request redhat-openstack#70 from ghoneycutt/fix_travis_link_in_readme
4e1bc1e Fix link to travis in README
38f260c Merge pull request redhat-openstack#68 from ghoneycutt/test_puppet_v3_4
17cba2f Merge pull request redhat-openstack#67 from ghoneycutt/enable_travis_fast_finish
4c1d651 Test against Puppet v3.4
9e6b0c4 Enable fast finish in Travis
a0b63eb Merge pull request redhat-openstack#65 from shrug/master
76ad4c4 Fix the regex t fix a bad match
6870dfe Add tests to cover settings with square brackets and quotes in the name
e779d12 Update settings regexes to support settings with "[", "]" in them
ae23a4d Merge pull request redhat-openstack#58 from jnewland/spaces-in-sections
c058ee5 support spaces in sections
2b45293 Merge pull request redhat-openstack#59 from antroy/master
10f270f Merge pull request redhat-openstack#63 from JHaals/master
ff98e78 make ensure => present the first attribute
d75ce1c Merge pull request redhat-openstack#61 from apenney/metadata
cd9bb11 Add empty dependencies section.
85cfc93 FM-103: Add metadata.json to all modules.
0a1dea4 Merge pull request redhat-openstack#60 from apenney/metadata
86c57aa Adding whitespace capability to section header regex
xbezdick added a commit to xbezdick/openstack-puppet-modules that referenced this pull request Dec 16, 2014
6b399c2 Merge pull request redhat-openstack#137 from cmurphy/master
7e6eba5 Add json gem
113cb70 Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md
19ddca4 Merge pull request redhat-openstack#134 from johnsyweb/less-restrictive-setting-names
792d35c Merge pull request redhat-openstack#135 from johnsyweb/The-Puppet-Labs-Issue-Tracker-has-Moved
d2d9ed9 Merge pull request redhat-openstack#136 from mhaskel/merge_1.2.x
927d879 The Puppet Labs Issue Tracker has Moved
3e46c13 Fix Ruby 1.9.3 build
efeb174 Add spec for redhat-openstack#123
c6dcad2 Simplify COMMENTED_SETTING_REGEX to match SETTING_REGEX
e65be6f Simplify SECTION_REGEX
d98e9bc Add failing spec for KDE Configuration with braces in setting names
91c1708 Merge pull request redhat-openstack#133 from mhaskel/1.2.0-prep
5bc9ebc 1.2.0 prep
3f4ad49 Merge pull request redhat-openstack#126 from huan/master
12a4271 Merge pull request redhat-openstack#132 from mhaskel/test
8db122c Merge pull request redhat-openstack#124 from cmurphy/master
d5164a9 Merge pull request redhat-openstack#130 from jbondpdx/update-readme
4e3f602 DOC-1100: old inifile causes agent run failure in PE 3.3
db28fa2 Merge pull request redhat-openstack#128 from mhaskel/1.1.4-prep
3d3a2cf 1.1.4-prep
58883cd Merge pull request redhat-openstack#127 from mhaskel/1.1.x-merged-into-master
8621dfe Merge remote-tracking branch 'upstream/1.1.x' into test
f343c41 modify test to compare to a hash which better tests the state of each setting also update @@COMMENTED_SETTING_REGEX to be roughly equal to "(\s*)[#;]+" + @@SETTING_REGEX
681f5c0 fix issue where single characters settings were not being saved.
8aeddc8 Merge pull request redhat-openstack#125 from mhaskel/spec_updates
7f54eb1 Update spec_helper for consistency.
90f88ec Merge pull request redhat-openstack#122 from jbondpdx/new-readme
c916aca Synchronize with modulesync
4c94689 Docs: fixed code formatting
9f9e1d4 Docs: New inifile readme
41e2ddb Merge pull request redhat-openstack#121 from apenney/113-release
62434bb Prepare a 1.1.3 release.
0e8abb9 Merge pull request redhat-openstack#120 from mhaskel/1.1.2-prep
33147cb 1.1.2-prep.
d6335f5 Merge pull request redhat-openstack#119 from hunner/release_1.1.1
f08a394 Release 1.1.1
09b574e Merge pull request redhat-openstack#115 from johnsyweb/handle-quotation-marks-in-section-names
07c4827 Merge remote-tracking branch 'puppetlabs/master' into temp
b3fed85 Spec for MODULES-1194
069aa56 Merge remote-tracking branch 'origin/master' into handle-quotation-marks-in-section-names
586207b Merge pull request redhat-openstack#118 from cmurphy/master
6b21db8 Add validate and lint tasks to travis script
7a5f54d Merge pull request redhat-openstack#117 from cmurphy/master
d7f0353 Update Gemfile for .travis.yml defaults
bd99244 Test allowing $ signs in section names
3a4bfb9 Synchronize .travis.yml
2a77caf Update .sync.yml to support new .travis.yml configs
281d2f9 Merge pull request redhat-openstack#114 from cmurphy/master
cabc678 Merge branch 'deprecation-warnings' into handle-quotation-marks-in-section-names
49960e1 Handle quotation marks in section names
41fc8bf Failing spec to describe my problem
961447d `be_true` and `be_false` are deprecated
2696725 Sync files
e346825 Add configuration file for modulesync
65d50f5 Merge pull request redhat-openstack#112 from mhaskel/no_modulefile
8f501f5 Remove the Modulefile, use metadata.json.
5e73e73 Merge pull request redhat-openstack#111 from cyberious/1.1.x
acc9f43 Add windows support and testing nodesets
29ffe09 Merge pull request redhat-openstack#109 from mhaskel/osx-test-fixes
842915d OSX doesn't support the -e flag to echo.
1170a53 Merge pull request redhat-openstack#107 from mhaskel/beaker-rspec-pinning
be5fd63 Require beaker-rspec >= 2.2
37cb6d4 Merge pull request redhat-openstack#106 from apenney/pin-rspec
8ca578c Pin rspec to 2.x.
e21dc0c Merge pull request redhat-openstack#104 from hunner/release_1.1.0
521b287 Release 1.1.0
0b9f9e2 Merge pull request redhat-openstack#101 from hunner/remove_stderr
6fb89f5 Remove stderr checks because of deprecations
6477d20 Merge pull request redhat-openstack#100 from mhaskel/1.1.0-prep
783fa4d Update PE version requirement.
027b7bc Prepare a 1.1.x release.
b366981 Merge pull request redhat-openstack#99 from apenney/typo-fix
a5b34ea Quick typo fix.
d4a2b22 Merge pull request redhat-openstack#95 from mruzicka/feature/master/quote-char-parameter-for-subsetting
6656f02 Merge pull request redhat-openstack#97 from apenney/add-platforms
61203df Add RHEL7 and Ubuntu 14.04 support.
85f00fe Merge pull request redhat-openstack#96 from apenney/10xmerge
e24dd91 Merge branch '1.0.x' into 10xmerge
77854d5 Tests for the quote_char parameter.
560bbc6 Add quote_char parameter to the ini_subsetting resource type
790aa9c Merge pull request redhat-openstack#94 from igalic/igorance
77429f6 be more igorant
8ca8e12 Merge pull request redhat-openstack#90 from apenney/last-minute-metadata-fix
0a92f32 Add missing fields back to work around Puppet bug.
2376e7c Merge pull request redhat-openstack#89 from apenney/102-supported
4021745 Prepare supported module 1.0.3.
0c27288 Merge pull request redhat-openstack#88 from apenney/metadata
6c63184 Add AIX and remove fields copied from Modulefile.
6b0a200 Merge pull request redhat-openstack#87 from laurenrother/1.0.x
f791521 Adds "Release Notes/Known Bugs" to Changelog, updates file format to markdown, standardizes the format of previous entries
1edd2d5 Merge pull request redhat-openstack#86 from apenney/fix-tmpdir
2aceaef Convert to using .tmpdir instead of a hardcoded /tmp, so this works on Windows too.
ca7e441 Merge pull request redhat-openstack#84 from hunner/grep_sol
eda726f It is actually all solaris
f271580 Merge pull request redhat-openstack#83 from hunner/grep_sol10
7de1e3d Correct syntax
698e632 Merge pull request redhat-openstack#82 from hunner/grep_sol10
49433d0 Avoid multi-line grep on Solaris 10
5ec46f6 Merge pull request redhat-openstack#81 from hunner/release_1.0.2
3757c71 Release 1.0.2
d17dcfb Merge pull request redhat-openstack#80 from hunner/fix_aix
17a59b2 AIX exits with 2 on file doesn't exist.
5e841a9 Merge branch 'missing_comma' into 1.0.x
6999ab0 Fix missing comma in metadata.json
08346e9 Merge pull request redhat-openstack#77 from hunner/add_metadata
5c2cb37 Add supported OS/PE/Puppet
b77ef8d Merge pull request redhat-openstack#78 from hunner/remove_autopublish
f5e607a Remove travis autopublish stuff
c1bc9d0 Merge pull request redhat-openstack#75 from justinstoller/maint/1.0.x/dont_use_hardcoded_modpath
25e7c28 Remove basic spec
48a4e08 Merge pull request redhat-openstack#74 from hunner/release_1.0.1
5b6de57 Release 1.0.1
a0c3b82 Merge pull request redhat-openstack#73 from hunner/dynamic_gemsource
ab21bd3 Allow custom gemsource
467c4c5 Merge pull request redhat-openstack#66 from hunner/update_specs
eda78ab (FM-161) Add beaker tests for parameter coverage
664051c Merge pull request redhat-openstack#70 from ghoneycutt/fix_travis_link_in_readme
4e1bc1e Fix link to travis in README
38f260c Merge pull request redhat-openstack#68 from ghoneycutt/test_puppet_v3_4
17cba2f Merge pull request redhat-openstack#67 from ghoneycutt/enable_travis_fast_finish
4c1d651 Test against Puppet v3.4
9e6b0c4 Enable fast finish in Travis
a0b63eb Merge pull request redhat-openstack#65 from shrug/master
76ad4c4 Fix the regex t fix a bad match
6870dfe Add tests to cover settings with square brackets and quotes in the name
e779d12 Update settings regexes to support settings with "[", "]" in them
ae23a4d Merge pull request redhat-openstack#58 from jnewland/spaces-in-sections
c058ee5 support spaces in sections
2b45293 Merge pull request redhat-openstack#59 from antroy/master
10f270f Merge pull request redhat-openstack#63 from JHaals/master
ff98e78 make ensure => present the first attribute
d75ce1c Merge pull request redhat-openstack#61 from apenney/metadata
cd9bb11 Add empty dependencies section.
85cfc93 FM-103: Add metadata.json to all modules.
0a1dea4 Merge pull request redhat-openstack#60 from apenney/metadata
86c57aa Adding whitespace capability to section header regex
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants