[puppetlabs/puppet] 638a6e: Merge branch '2.7rc' into 2.7.x
0 views
Skip to first unread message
GitHub
May 31, 2012, 2:57:43 PM5/31/12
to puppet-...@googlegroups.com, puppet...@googlegroups.com
Branch: refs/heads/3.0rc
Home: https://github.com/puppetlabs/puppet
Commit: 638a6e433c22758cbb29e544ee1f0d9833ca33ba
https://github.com/puppetlabs/puppet/commit/638a6e433c22758cbb29e544ee1f0d9833ca33ba
Author: Moses Mendoza <mo...@puppetlabs.com>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
Log Message:
-----------
Merge branch '2.7rc' into 2.7.x
Commit: 0788ea2d3630dc158b121ef44b8cef05d3906a53
https://github.com/puppetlabs/puppet/commit/0788ea2d3630dc158b121ef44b8cef05d3906a53
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-22 (Tue, 22 May 2012)
Changed paths:
M lib/puppet/provider/service/gentoo.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
A spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Exclude helperscripts in gentoo service provider
The directory `/etc/init.d` does not only store normal initscripts but
also a few helper scripts (like `functions.sh`). The former behaviour was
to treat them as regular initscripts which can lead to dangerous results
especially when running `puppet resource service`. This command will
issue `/etc/init.d/<script> status` on every script inside
`/etc/init.d`. Because the helperscripts don't care about arguments,
this will cause the system to reboot when `/etc/init.d/reboot.sh status` is
executed.
Exclude helperscripts when searching inside `/etc/init.d`.
Commit: 20c3da38aca4062fc384571409cf3dcb23aaa4c1
https://github.com/puppetlabs/puppet/commit/20c3da38aca4062fc384571409cf3dcb23aaa4c1
Author: Moses Mendoza <mo...@puppetlabs.com>
Date: 2012-05-29 (Tue, 29 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
Log Message:
-----------
Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
Commit: c0cb0fa0fd3c6412891f8327875eae66efab03dd
https://github.com/puppetlabs/puppet/commit/c0cb0fa0fd3c6412891f8327875eae66efab03dd
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/upstart.rb
Log Message:
-----------
(Maint) Close filehandles after read in upstart
Not closing the filehandle after reading leaves a File object floating
around with an open handle. On unix systems this is ok, but on Windows
this causes a problem for the subsequent move of the new file into
place.
This changes to reading of a file to ensure that the file handle is
closed after we finish reading.
Commit: e7ca37655ed23bed1830db072ab6a2c4299e32fa
https://github.com/puppetlabs/puppet/commit/e7ca37655ed23bed1830db072ab6a2c4299e32fa
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/upstart.rb
Log Message:
-----------
Merge pull request #825 from zaphod42/maint/2.7rc/leaked-filehandles-in-upstart
Maint/2.7rc/leaked filehandles in upstart
Commit: 060810e9affcc13b97d143e0e8ec62a63d5db7ec
https://github.com/puppetlabs/puppet/commit/060810e9affcc13b97d143e0e8ec62a63d5db7ec
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/init.rb
M spec/integration/provider/service/init_spec.rb
M spec/unit/provider/service/init_spec.rb
Log Message:
-----------
maint: Make it easier to test the service provider
Before the change the directories to search for initscripts (e.g.
`/etc/init.d`, `/sbin/init.d`) were stored in a class variable that was
calculated at load time. This way stubbing `operatingsystem` in test
cases did not change the value of `@defpath`.
Turning the class variable in a class method. This way stubbing
operatingsystem does change the result when querying defpath. The fact
lookup should be relativly cheap so we do not have to cache the
value in a class variable.
Commit: f11dfd6b3021403d746efd863028af8620422e26
https://github.com/puppetlabs/puppet/commit/f11dfd6b3021403d746efd863028af8620422e26
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Fix provider spec tests to work on non gentoo systems
The gentoo service provider tests made the assumption that /etc/init.d
is always the directory where the service provider will look for init
scripts while in fact the path depends on the operatingsystem.
The service provider spec also made the assumption that the sshd init
script is present on the target machine.
Stub the operatingsystem fact to prevent failures.
Stub the stat-call so the sshd script is always considered present.
Commit: 9c9189fecd4cdc8b40097c718290f3d5424c4c49
https://github.com/puppetlabs/puppet/commit/9c9189fecd4cdc8b40097c718290f3d5424c4c49
Author: Daniel Pittman <dan...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/gentoo.rb
M lib/puppet/provider/service/init.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
M spec/integration/network/server/mongrel_spec.rb
M spec/integration/network/server/webrick_spec.rb
M spec/integration/provider/service/init_spec.rb
A spec/unit/provider/service/gentoo_spec.rb
M spec/unit/provider/service/init_spec.rb
Log Message:
-----------
Merge 'ticket/2.7.x/14615' from stschulte into 2.7rc
This blacklists some helper scripts in /etc/init.d that can, among other
things, cause the system to immediately reboot when Puppet tries to read the
status of the "reboot" script.
Commit: 37df5c4203fd78a765d789d61e37712bcf7034eb
https://github.com/puppetlabs/puppet/commit/37df5c4203fd78a765d789d61e37712bcf7034eb
Author: Daniel Pittman <dan...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Final stub fixes for the tests.
The tests assumed that they were run on a Linux, or Linux-like, system that
had ssh installed an a valid init script for it present. This isn't true on
all our platforms, so we need to stub a little more of the outside.
Signed-off-by: Daniel Pittman <dan...@puppetlabs.com>
Commit: 7c1d8c200f8aa65149adf682091368f958603a74
https://github.com/puppetlabs/puppet/commit/7c1d8c200f8aa65149adf682091368f958603a74
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/upstart_spec.rb
Log Message:
-----------
(maint) Disable upstart spec test on windows
replace_file is disabled on windows, so the upstart spec test fails when the
provider calls out to replace_file. This commit confines the test to
non-windows platforms, where replace_file is defined.
Commit: 9282e27afb0798ef35fe65d6c569506796cbdeda
https://github.com/puppetlabs/puppet/commit/9282e27afb0798ef35fe65d6c569506796cbdeda
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/upstart_spec.rb
Log Message:
-----------
Merge pull request #826 from haus/disable_upstart_spec_windows
Disable upstart spec windows
Commit: e619304a0a60593c4b264d0c522ece7f764f94f9
https://github.com/puppetlabs/puppet/commit/e619304a0a60593c4b264d0c522ece7f764f94f9
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/redhat.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
(#14761) Add boot, reboot to excludes list for redhat provider
On sles, the reboot init script would be triggered during a `puppet resource
service` call, which would ignore the status argument and proceed to reboot the
system. It would also call the boot init script, which could hang the puppet
call indefinitely. This commit adds both the boot and reboot services to the
redhat provider's exclude list. It also updates the redhat provider spec test
to test for those changes.
Commit: a9bf33f5a6f3005a0e4bdc8b2973c3e82c615d07
https://github.com/puppetlabs/puppet/commit/a9bf33f5a6f3005a0e4bdc8b2973c3e82c615d07
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M lib/puppet/provider/service/redhat.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
Merge pull request #827 from haus/ticket/2.7rc/14761_add_excludes_for_sles_services_to_redhat_provider
Ticket/2.7rc/14761 add excludes for sles services to redhat provider
Commit: 3b7673059e44a36371ecaa74d43f4a5df2870e09
https://github.com/puppetlabs/puppet/commit/3b7673059e44a36371ecaa74d43f4a5df2870e09
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
M lib/puppet/provider/service/gentoo.rb
M lib/puppet/provider/service/init.rb
M lib/puppet/provider/service/redhat.rb
M lib/puppet/provider/service/upstart.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
M spec/integration/provider/service/init_spec.rb
A spec/unit/provider/service/gentoo_spec.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
Merge remote-tracking branch 'upstream/2.7rc' into HEAD
* upstream/2.7rc:
(#14761) Add boot, reboot to excludes list for redhat provider
(maint) Disable upstart spec test on windows
(#14615) Final stub fixes for the tests.
(#14615) Fix provider spec tests to work on non gentoo systems
maint: Make it easier to test the service provider
(Maint) Close filehandles after read in upstart
Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
(#14615) Exclude helperscripts in gentoo service provider
Conflicts:
CHANGELOG
conf/redhat/puppet.spec
spec/integration/provider/service/init_spec.rb
spec/unit/provider/service/init_spec.rb
This commit undoes the restriction on the upstart spec that kept it from
running on windows. And allowed a freebsd test to begin running on 1.9
series ruby
Compare: https://github.com/puppetlabs/puppet/compare/1d24ef2...3b76730
Home: https://github.com/puppetlabs/puppet
Commit: 638a6e433c22758cbb29e544ee1f0d9833ca33ba
https://github.com/puppetlabs/puppet/commit/638a6e433c22758cbb29e544ee1f0d9833ca33ba
Author: Moses Mendoza <mo...@puppetlabs.com>
Date: 2012-05-16 (Wed, 16 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
Log Message:
-----------
Merge branch '2.7rc' into 2.7.x
Commit: 0788ea2d3630dc158b121ef44b8cef05d3906a53
https://github.com/puppetlabs/puppet/commit/0788ea2d3630dc158b121ef44b8cef05d3906a53
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-22 (Tue, 22 May 2012)
Changed paths:
M lib/puppet/provider/service/gentoo.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
A spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Exclude helperscripts in gentoo service provider
The directory `/etc/init.d` does not only store normal initscripts but
also a few helper scripts (like `functions.sh`). The former behaviour was
to treat them as regular initscripts which can lead to dangerous results
especially when running `puppet resource service`. This command will
issue `/etc/init.d/<script> status` on every script inside
`/etc/init.d`. Because the helperscripts don't care about arguments,
this will cause the system to reboot when `/etc/init.d/reboot.sh status` is
executed.
Exclude helperscripts when searching inside `/etc/init.d`.
Commit: 20c3da38aca4062fc384571409cf3dcb23aaa4c1
https://github.com/puppetlabs/puppet/commit/20c3da38aca4062fc384571409cf3dcb23aaa4c1
Author: Moses Mendoza <mo...@puppetlabs.com>
Date: 2012-05-29 (Tue, 29 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
Log Message:
-----------
Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
Commit: c0cb0fa0fd3c6412891f8327875eae66efab03dd
https://github.com/puppetlabs/puppet/commit/c0cb0fa0fd3c6412891f8327875eae66efab03dd
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/upstart.rb
Log Message:
-----------
(Maint) Close filehandles after read in upstart
Not closing the filehandle after reading leaves a File object floating
around with an open handle. On unix systems this is ok, but on Windows
this causes a problem for the subsequent move of the new file into
place.
This changes to reading of a file to ensure that the file handle is
closed after we finish reading.
Commit: e7ca37655ed23bed1830db072ab6a2c4299e32fa
https://github.com/puppetlabs/puppet/commit/e7ca37655ed23bed1830db072ab6a2c4299e32fa
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/upstart.rb
Log Message:
-----------
Merge pull request #825 from zaphod42/maint/2.7rc/leaked-filehandles-in-upstart
Maint/2.7rc/leaked filehandles in upstart
Commit: 060810e9affcc13b97d143e0e8ec62a63d5db7ec
https://github.com/puppetlabs/puppet/commit/060810e9affcc13b97d143e0e8ec62a63d5db7ec
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/init.rb
M spec/integration/provider/service/init_spec.rb
M spec/unit/provider/service/init_spec.rb
Log Message:
-----------
maint: Make it easier to test the service provider
Before the change the directories to search for initscripts (e.g.
`/etc/init.d`, `/sbin/init.d`) were stored in a class variable that was
calculated at load time. This way stubbing `operatingsystem` in test
cases did not change the value of `@defpath`.
Turning the class variable in a class method. This way stubbing
operatingsystem does change the result when querying defpath. The fact
lookup should be relativly cheap so we do not have to cache the
value in a class variable.
Commit: f11dfd6b3021403d746efd863028af8620422e26
https://github.com/puppetlabs/puppet/commit/f11dfd6b3021403d746efd863028af8620422e26
Author: Stefan Schulte <stefan....@taunusstein.net>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Fix provider spec tests to work on non gentoo systems
The gentoo service provider tests made the assumption that /etc/init.d
is always the directory where the service provider will look for init
scripts while in fact the path depends on the operatingsystem.
The service provider spec also made the assumption that the sshd init
script is present on the target machine.
Stub the operatingsystem fact to prevent failures.
Stub the stat-call so the sshd script is always considered present.
Commit: 9c9189fecd4cdc8b40097c718290f3d5424c4c49
https://github.com/puppetlabs/puppet/commit/9c9189fecd4cdc8b40097c718290f3d5424c4c49
Author: Daniel Pittman <dan...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/gentoo.rb
M lib/puppet/provider/service/init.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
M spec/integration/network/server/mongrel_spec.rb
M spec/integration/network/server/webrick_spec.rb
M spec/integration/provider/service/init_spec.rb
A spec/unit/provider/service/gentoo_spec.rb
M spec/unit/provider/service/init_spec.rb
Log Message:
-----------
Merge 'ticket/2.7.x/14615' from stschulte into 2.7rc
This blacklists some helper scripts in /etc/init.d that can, among other
things, cause the system to immediately reboot when Puppet tries to read the
status of the "reboot" script.
Commit: 37df5c4203fd78a765d789d61e37712bcf7034eb
https://github.com/puppetlabs/puppet/commit/37df5c4203fd78a765d789d61e37712bcf7034eb
Author: Daniel Pittman <dan...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/gentoo_spec.rb
Log Message:
-----------
(#14615) Final stub fixes for the tests.
The tests assumed that they were run on a Linux, or Linux-like, system that
had ssh installed an a valid init script for it present. This isn't true on
all our platforms, so we need to stub a little more of the outside.
Signed-off-by: Daniel Pittman <dan...@puppetlabs.com>
Commit: 7c1d8c200f8aa65149adf682091368f958603a74
https://github.com/puppetlabs/puppet/commit/7c1d8c200f8aa65149adf682091368f958603a74
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/upstart_spec.rb
Log Message:
-----------
(maint) Disable upstart spec test on windows
replace_file is disabled on windows, so the upstart spec test fails when the
provider calls out to replace_file. This commit confines the test to
non-windows platforms, where replace_file is defined.
Commit: 9282e27afb0798ef35fe65d6c569506796cbdeda
https://github.com/puppetlabs/puppet/commit/9282e27afb0798ef35fe65d6c569506796cbdeda
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M spec/unit/provider/service/upstart_spec.rb
Log Message:
-----------
Merge pull request #826 from haus/disable_upstart_spec_windows
Disable upstart spec windows
Commit: e619304a0a60593c4b264d0c522ece7f764f94f9
https://github.com/puppetlabs/puppet/commit/e619304a0a60593c4b264d0c522ece7f764f94f9
Author: Matthaus Litteken <matt...@puppetlabs.com>
Date: 2012-05-30 (Wed, 30 May 2012)
Changed paths:
M lib/puppet/provider/service/redhat.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
(#14761) Add boot, reboot to excludes list for redhat provider
On sles, the reboot init script would be triggered during a `puppet resource
service` call, which would ignore the status argument and proceed to reboot the
system. It would also call the boot init script, which could hang the puppet
call indefinitely. This commit adds both the boot and reboot services to the
redhat provider's exclude list. It also updates the redhat provider spec test
to test for those changes.
Commit: a9bf33f5a6f3005a0e4bdc8b2973c3e82c615d07
https://github.com/puppetlabs/puppet/commit/a9bf33f5a6f3005a0e4bdc8b2973c3e82c615d07
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M lib/puppet/provider/service/redhat.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
Merge pull request #827 from haus/ticket/2.7rc/14761_add_excludes_for_sles_services_to_redhat_provider
Ticket/2.7rc/14761 add excludes for sles services to redhat provider
Commit: 3b7673059e44a36371ecaa74d43f4a5df2870e09
https://github.com/puppetlabs/puppet/commit/3b7673059e44a36371ecaa74d43f4a5df2870e09
Author: Andrew Parker <an...@puppetlabs.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M CHANGELOG
M conf/redhat/puppet.spec
M lib/puppet/provider/service/gentoo.rb
M lib/puppet/provider/service/init.rb
M lib/puppet/provider/service/redhat.rb
M lib/puppet/provider/service/upstart.rb
A spec/fixtures/unit/provider/service/gentoo/rc_update_show
M spec/integration/provider/service/init_spec.rb
A spec/unit/provider/service/gentoo_spec.rb
M spec/unit/provider/service/redhat_spec.rb
Log Message:
-----------
Merge remote-tracking branch 'upstream/2.7rc' into HEAD
* upstream/2.7rc:
(#14761) Add boot, reboot to excludes list for redhat provider
(maint) Disable upstart spec test on windows
(#14615) Final stub fixes for the tests.
(#14615) Fix provider spec tests to work on non gentoo systems
maint: Make it easier to test the service provider
(Maint) Close filehandles after read in upstart
Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
(#14615) Exclude helperscripts in gentoo service provider
Conflicts:
CHANGELOG
conf/redhat/puppet.spec
spec/integration/provider/service/init_spec.rb
spec/unit/provider/service/init_spec.rb
This commit undoes the restriction on the upstart spec that kept it from
running on windows. And allowed a freebsd test to begin running on 1.9
series ruby
Compare: https://github.com/puppetlabs/puppet/compare/1d24ef2...3b76730
Reply all
Reply to author
Forward
0 new messages