puppet into 2.6.next
2a94c61e6c94Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next

Details

Provenance

Markus Roberts <Markus@reality.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUed1359902d14: Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.next
rPU07edcf716b2f: Merge branch 'bug/2.6.next/5755-yaml-backrefs' into 2.6.next

Branches

Unknown

Tags

Unknown

Event Timeline

Markus Roberts <Markus@reality.com> committed rPU2a94c61e6c94: Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next (authored by Markus Roberts <Markus@reality.com>).Feb 2 2011, 2:57 AM

Merged Changes

ed1359902d14 Merge remote branch 'bodepd/feature/2.6.4/5910' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
526335cff0f4 Merge branch 'ticket/2.6.x/5913' of git://github.com/mitchellh/puppet into 2.6.
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c677f5bd4bb1 Merge remote branch 'james/tickets/2.6.x/5916' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9b064e655f90 Merge remote branch 'james/tickets/2.6.x/5914' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9a7a39b3f930 Merge remote branch 'jamtur01/tickets/2.6.x/6071' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d452353f887 Merge branch 'tickets/2.6.x/5564' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
bc6a4ef9a15d Merge remote branch 'james/tickets/2.6.x/6002' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
a732a15a0fd4 Fixed #5564 - Added some more fqdn_rand documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
54f8698fba2c Merge remote branch 'jamtur01/tickets/2.6.x/5736' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
c4da5fcb0ef7 Merge branch 'tickets/2.6.x/5167' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
f34141477244 Merge remote branch 'james/tickets/2.6.x/5742' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1bfc9a0314c3 Fixed #6071 - Fixed typo and improved exec path error message
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
dd332f6e87dc Fixed #6002 - Added note about function execution
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
ae48634cec08 Fixed #5914 Removed genconfig = true from genconfig output
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
66b442b723f1 Fixes #5916 - Cleanup of unused doc methods and documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
9b74968a42d9 Modified rubydoc in lib/puppet/util/command_line/puppetca to fix inaccurate…
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
e58f5dc724c0 Fixed #5742 - Removed legacy fqdn option from documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
4d1b51fbcd7d Fixed #5167 - misleading documentation in the defaults of [main]
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
c1b5c7f515a0 (#5913) Fix Puppet::Application.find constant lookup behavior
Author
Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Browse Repository
No Builds
No Audits
87c5c30fe8d2 (#5910) Improved logging when declared classes cannot be found:
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

lib/

puppet/

application.rb

application/

doc.rb

defaults.rb

parser/

functions/

reference/

type/

util/

command_line/

spec/

integration/

reference/

providers_spec.rb

unit/

application/

doc_spec.rb

application_spec.rb

resource_spec.rb

rPU2a94c61e6c94

View Options

lib/puppet/application.rb

View Options

lib/puppet/application/doc.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/parser/functions/fqdn_rand.rb

View Options

lib/puppet/reference/function.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/type/exec.rb

View Options

lib/puppet/util/command_line/puppetca

View Options

lib/puppet/util/command_line/puppetd

View Options

lib/puppet/util/command_line/puppetdoc

View Options

lib/puppet/util/reference.rb

View Options

lib/puppet/util/settings.rb

View Options

spec/integration/reference/providers_spec.rb

View Options

spec/unit/application/doc_spec.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/resource_spec.rb

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next2a94c61e6c94UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (16)

rPU2a94c61e6c94

lib/puppet/application.rb

lib/puppet/application/doc.rb

lib/puppet/defaults.rb

lib/puppet/parser/functions/fqdn_rand.rb

lib/puppet/reference/function.rb

lib/puppet/resource.rb

lib/puppet/type/exec.rb

lib/puppet/util/command_line/puppetca

lib/puppet/util/command_line/puppetd

lib/puppet/util/command_line/puppetdoc

lib/puppet/util/reference.rb

lib/puppet/util/settings.rb

spec/integration/reference/providers_spec.rb

spec/unit/application/doc_spec.rb

spec/unit/application_spec.rb

spec/unit/resource_spec.rb

Merge branch '2.6.next' of git://github.com/puppetlabs/puppet into 2.6.next
2a94c61e6c94Unpublished
Actions