Merging the multi_env branch with master. There are not actually any…
b9f529a063caUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merging the multi_env branch with master. There are not actually any conflicts, so this commit might only be necessary because I did not pull sufficiently often.

Details

Provenance

Luke Kanies <luke@madstop.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU282ec893ef89: Fixing the spec library so it correctly can see its version
rPU0682d7e473cf: Merge branch 'multi_env'

Branches

Unknown

Tags

Unknown

Event Timeline

Luke Kanies <luke@madstop.com> committed rPUb9f529a063ca: Merging the multi_env branch with master. There are not actually any… (authored by Luke Kanies <luke@madstop.com>).Aug 23 2007, 1:07 AM

Merged Changes

282ec893ef89 Fixing the spec library so it correctly can see its version
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
6ff461b8c2fb Merge branch 'master' of http://northstarlabs.net/git/puppet
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
9208931005d5 Merge /home/michael/git/puppet
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
014a576066ae Merge ssh://michael@reductivelabs.com/home/michael/git/puppet
Author
Michael V. O'Brien <michael@reductivelabs.com>
Browse Repository
No Builds
No Audits
2ff15c015b45 Added shortname support to config.rb and refactored addargs
Author
Michael V. O'Brien <michael@reductivelabs.com>
Browse Repository
No Builds
No Audits
3bccd52b8e25 Merge /opt/rl/git/puppet
Author
Luke Kanies <luke@madstop.com>
Browse Repository
No Builds
No Audits
58e3855bb1c9 Added optional per-module lib directory.
Author
Jeffrey J McCune <jeff.mccune@northstarlabs.net>
Browse Repository
No Builds
No Audits
40491ebe7ca9 Merge /opt/rl/git/puppet
Author
luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Browse Repository
No Builds
No Audits
b59d396b504f Revert "Updating more milestone names"
Author
luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Browse Repository
No Builds
No Audits
3e9ac59b2937 Updating more milestone names
Author
luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

CHANGELOG

examples/

code/

modules/

lib/

puppet/

util/

autoload.rb

config.rb

suidmanager.rb

test/

lib/

spec/

version.rb

util/

config.rb

rPUb9f529a063ca

View Options

CHANGELOG

View Options

examples/code/modules/sample-module.pp

View Options

examples/code/modules/sample-module/README.txt

View Options

examples/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb

View Options

examples/code/modules/sample-module/manifests/init.pp

View Options

examples/code/modules/sample-module/templates/sample.erb

View Options

lib/puppet/util/autoload.rb

View Options

lib/puppet/util/config.rb

View Options

lib/puppet/util/suidmanager.rb

View Options

test/lib/spec/version.rb

View Options

Merging the multi_env branch with master. There are not actually any…b9f529a063caUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (19)

rPUb9f529a063ca

CHANGELOG

examples/code/modules/sample-module.pp

examples/code/modules/sample-module/README.txt

examples/code/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb

examples/code/modules/sample-module/manifests/init.pp

examples/code/modules/sample-module/templates/sample.erb

lib/puppet/util/autoload.rb

lib/puppet/util/config.rb

lib/puppet/util/suidmanager.rb

test/lib/spec/version.rb

test/util/config.rb

Merging the multi_env branch with master. There are not actually any…
b9f529a063caUnpublished
Actions