3559'
f95546c97ecdUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/pr/3559'

upstream/pr/3559: Revert "(PUP-3632) Update paths and defaults for the unified agent layout"

Details

Provenance

Josh Cooper <josh@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU2270553e7ebf: Revert "(PUP-3632) Update paths and defaults for the unified agent layout"
rPU54551dbbfa06: Merge remote-tracking branch 'upstream/pr/3558'

Branches

Unknown

Tags

Unknown

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPUf95546c97ecd: Merge remote-tracking branch 'upstream/pr/3559' (authored by Josh Cooper <josh@puppetlabs.com>).Feb 3 2015, 1:59 AM

Merged Changes

2270553e7ebf Revert "(PUP-3632) Update paths and defaults for the unified agent layout"
Author
Will Hopper <whopper@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

acceptance/

lib/

puppet/

acceptance/

environment_utils_spec.rb

module_utils.rb

setup/

git/

pre-suite/

030_PuppetMasterSanity.rb

conf/

puppet.conf

ext/

debian/

puppet.conf

puppet.init

puppetmaster.init

gentoo/

conf.d/

puppet/

ips/

redhat/

solaris/

smf/

suse/

lib/

puppet/

defaults.rb

reference/

configuration.rb

util/

run_mode.rb

man/

man5/

puppet.conf.5

spec/

unit/

indirector/

catalog/

static_compiler_spec.rb

util/

run_mode_spec.rb

selinux_spec.rb

rPUf95546c97ecd

View Options

acceptance/lib/puppet/acceptance/environment_utils_spec.rb

View Options

acceptance/lib/puppet/acceptance/module_utils.rb

View Options

acceptance/setup/git/pre-suite/030_PuppetMasterSanity.rb

View Options

conf/puppet.conf

View Options

ext/debian/puppet.conf

View Options

ext/debian/puppet.init

View Options

ext/debian/puppetmaster.init

View Options

ext/gentoo/conf.d/puppet

View Options

ext/gentoo/conf.d/puppetmaster

View Options

ext/gentoo/puppet/puppet.conf

View Options

ext/ips/puppet.conf

View Options

ext/redhat/client.init

View Options

ext/redhat/puppet.conf

View Options

ext/redhat/server.init

View Options

ext/solaris/smf/svc-puppetd

View Options

ext/solaris/smf/svc-puppetmasterd

View Options

ext/suse/client.init

View Options

ext/suse/server.init

View Options

install.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/reference/configuration.rb

View Options

lib/puppet/util/run_mode.rb

View Options

man/man5/puppet.conf.5

View Options

spec/unit/indirector/catalog/static_compiler_spec.rb

View Options

spec/unit/util/run_mode_spec.rb

View Options

spec/unit/util/selinux_spec.rb

Merge remote-tracking branch 'upstream/pr/3559'f95546c97ecdUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (26)

rPUf95546c97ecd

acceptance/lib/puppet/acceptance/environment_utils_spec.rb

acceptance/lib/puppet/acceptance/module_utils.rb

acceptance/setup/git/pre-suite/030_PuppetMasterSanity.rb

conf/puppet.conf

ext/debian/puppet.conf

ext/debian/puppet.init

ext/debian/puppetmaster.init

ext/gentoo/conf.d/puppet

ext/gentoo/conf.d/puppetmaster

ext/gentoo/puppet/puppet.conf

ext/ips/puppet.conf

ext/redhat/client.init

ext/redhat/puppet.conf

ext/redhat/server.init

ext/solaris/smf/svc-puppetd

ext/solaris/smf/svc-puppetmasterd

ext/suse/client.init

ext/suse/server.init

install.rb

lib/puppet/defaults.rb

lib/puppet/reference/configuration.rb

lib/puppet/util/run_mode.rb

man/man5/puppet.conf.5

spec/unit/indirector/catalog/static_compiler_spec.rb

spec/unit/util/run_mode_spec.rb

spec/unit/util/selinux_spec.rb

Merge remote-tracking branch 'upstream/pr/3559'
f95546c97ecdUnpublished
Actions