Merge branch 'master' into next
21efa7b28208Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into next

This is the code for 2.6 RC3

Details

Provenance

Jesse Wolfe <jes5199@gmail.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU91185c6c04dc: New man pages for 2.6.0
rPU9caa04fd3635: Merge branch '0.25.x' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU21efa7b28208: Merge branch 'master' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Jul 15 2010, 12:24 AM

Merged Changes

91185c6c04dc New man pages for 2.6.0
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
1cda7c53e340 Fixes errant Trac references in documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
f60b6a0e54bf Updated CHANGELOG for 2.6.0rc3
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
9df87e986c28 [#4219] Install misses command_line dir, puppet $app --help fails
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
04228528d1f8 conf/redhat: Consistently pass pidfile option to daemon, killproc, and status
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
63bf037dc297 conf/redhat: Update conf/init files for single binary
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
f72741f2165f conf/redhat: Rebase rundir-perms patch
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
793d7b7cfd2b [#4213] -o option for setting onetime now works properly
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
2edf7fe968ac [#3656] Serializing arrays of references
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
27d5a4782c44 [#4215] Have rundir depend on vardir
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
06cc552b8b11 Fix for #4220 -- modules not implicitly loading their init files
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits

Changes (39)

Path

Size

CHANGELOG

conf/

redhat/

examples/

modules/

sample-module/

README.txt

lib/

puppet/

parser/

functions/

ext/

regexp_nodes/

lib/

puppet/

application/

agent.rb

defaults.rb

module.rb

parser/

functions/

inline_template.rb

provider/

nameservice/

package/

reference/

util/

command_line/

man/

man5/

man8/

spec/

unit/

application/

agent_spec.rb

resource_spec.rb

util/

run_mode_spec.rb

rPU21efa7b28208

View Options

CHANGELOG

View Options

conf/redhat/client.init

View Options

conf/redhat/puppet.conf

View Options

conf/redhat/rundir-perms.patch

View Options

conf/redhat/server.init

View Options

examples/modules/sample-module/README.txt

View Options

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

View Options

ext/extlookup.rb

View Options

ext/regexp_nodes/regexp_nodes.rb

View Options

install.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/parser/functions/inline_template.rb

View Options

lib/puppet/provider/nameservice/directoryservice.rb

View Options

lib/puppet/provider/package/pkgdmg.rb

View Options

lib/puppet/reference/providers.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/util/command_line/filebucket

View Options

lib/puppet/util/command_line/puppet

View Options

lib/puppet/util/command_line/puppetd

View Options

lib/puppet/util/command_line/puppetmasterd

View Options

lib/puppet/util/command_line/puppetqd

View Options

lib/puppet/util/command_line/ralsh

View Options

lib/puppet/util/run_mode.rb

View Options

man/man5/puppet.conf.5

View Options

man/man8/filebucket.8

View Options

man/man8/pi.8

View Options

man/man8/puppet.8

View Options

man/man8/puppetca.8

View Options

man/man8/puppetd.8

View Options

man/man8/puppetdoc.8

View Options

man/man8/puppetmasterd.8

View Options

man/man8/puppetqd.8

View Options

man/man8/puppetrun.8

View Options

man/man8/ralsh.8

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/util/run_mode_spec.rb

Merge branch 'master' into next21efa7b28208UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (39)

rPU21efa7b28208

CHANGELOG

conf/redhat/client.init

conf/redhat/puppet.conf

conf/redhat/rundir-perms.patch

conf/redhat/server.init

examples/modules/sample-module/README.txt

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

ext/extlookup.rb

ext/regexp_nodes/regexp_nodes.rb

install.rb

lib/puppet/application/agent.rb

lib/puppet/defaults.rb

lib/puppet/module.rb

lib/puppet/parser/functions/inline_template.rb

lib/puppet/provider/nameservice/directoryservice.rb

lib/puppet/provider/package/pkgdmg.rb

lib/puppet/reference/providers.rb

lib/puppet/resource.rb

lib/puppet/util/command_line/filebucket

lib/puppet/util/command_line/puppet

lib/puppet/util/command_line/puppetd

lib/puppet/util/command_line/puppetmasterd

lib/puppet/util/command_line/puppetqd

lib/puppet/util/command_line/ralsh

lib/puppet/util/run_mode.rb

man/man5/puppet.conf.5

man/man8/filebucket.8

man/man8/pi.8

man/man8/puppet.8

man/man8/puppetca.8

man/man8/puppetd.8

man/man8/puppetdoc.8

man/man8/puppetmasterd.8

man/man8/puppetqd.8

man/man8/puppetrun.8

man/man8/ralsh.8

spec/unit/application/agent_spec.rb

spec/unit/resource_spec.rb

spec/unit/util/run_mode_spec.rb

Merge branch 'master' into next
21efa7b28208Unpublished
Actions