Merge branch 'stable'
09ef87250ed8Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'stable'

Conflicts:
lib/puppet/environments.rb

Details

Provenance

Kylo Ginsberg <kylo@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUa25663d11952: Merge pull request #3391 from joshcooper/ticket/stable/PUP-3739-dont-require…
rPU2ff01a392ba6: Merge pull request #3389 from rji/maint/master/rhel7-masters-sol-agent

Branches

Unknown

Tags

Unknown

Event Timeline

Kylo Ginsberg <kylo@puppetlabs.com> committed rPU09ef87250ed8: Merge branch 'stable' (authored by Kylo Ginsberg <kylo@puppetlabs.com>).Dec 5 2014, 8:09 PM

Merged Changes

a25663d11952 Merge pull request #3391 from joshcooper/ticket/stable/PUP-3739-dont-require…
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
d29ab955adbc Merge pull request #3388 from hlindberg/PUP-3389_cherry-pick-fix-to-stable
Author
Josh Partlow <jpartlow@glatisant.org>
Browse Repository
No Builds
No Audits
5176c5d39681 (PUP-3389) Do not list all directories when getting an environment
Author
Josh Partlow <joshua.partlow@puppetlabs.com>
Browse Repository
No Builds
No Audits
302292298e3e (PUP-3739) Don't require master to have agent role
Author
Josh Cooper <josh@puppetlabs.com>
Browse Repository
No Builds
No Audits
e89f32be51f3 Merge pull request #3380 from Sharpie/PUP-3728-fix-cron-monthnames
Author
Kylo Ginsberg <kylo@puppetlabs.com>
Browse Repository
No Builds
No Audits
8d685a2b76f2 (PUP-3728) Fix off by one error in cron month names
Author
Charlie Sharpsteen <chuck@puppetlabs.com>
Browse Repository
No Builds
No Audits
a8052a19418a Merge pull request #3378 from Iristyle/ticket/stable/PUP-3479-update-FFI…
Author
Josh Cooper <josh+github@puppetlabs.com>
Browse Repository
No Builds
No Audits
b9a50e5cdea8 (PUP-3479) (PUP-3737) Update Windows ffi ~> 1.9.5
Author
Michael Smith <michael.smith@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (5)

Path

Size

acceptance/

setup/

git/

pre-suite/

010_TestSetup.rb

tests/

security/

cve-2013-1654_sslv2_downgrade_master.rb

ticket_3360_allow_duplicate_csr_with_option_set.rb

lib/

puppet/

type/

cron.rb

spec/

unit/

type/

cron_spec.rb

rPU09ef87250ed8

View Options

acceptance/setup/git/pre-suite/010_TestSetup.rb

View Options

acceptance/tests/security/cve-2013-1654_sslv2_downgrade_master.rb

View Options

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

View Options

lib/puppet/type/cron.rb

View Options

spec/unit/type/cron_spec.rb

Merge branch 'stable'09ef87250ed8UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (5)

rPU09ef87250ed8

acceptance/setup/git/pre-suite/010_TestSetup.rb

acceptance/tests/security/cve-2013-1654_sslv2_downgrade_master.rb

acceptance/tests/ticket_3360_allow_duplicate_csr_with_option_set.rb

lib/puppet/type/cron.rb

spec/unit/type/cron_spec.rb

Merge branch 'stable'
09ef87250ed8Unpublished
Actions