Diffusion puppet ec4254dec20c

Merge branch '2.6.next' into 2.6.x
ec4254dec20cUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.next' into 2.6.x

2.6.next: (#6018) Nick F's --help text for puppet inspect. (#5823) document the not-an-API status of set_run_mode (#5823) run mode can now be set dynamically... (6114) Update the audit metaparameter for 2.6.5. Fix for #5755 -- making zaml serialization robust over projected objects (#4139) hook log autoflush into global defaults

Details

Provenance

Jacob Helwig <jacob@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUe10ba1ab720c: Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.next
rPU876d0503dd93: Merge branch '2.6.next' into 2.6.x

Branches

Unknown

Tags

Unknown

Event Timeline

Jacob Helwig <jacob@puppetlabs.com> committed rPUec4254dec20c: Merge branch '2.6.next' into 2.6.x (authored by Jacob Helwig <jacob@puppetlabs.com>).Feb 4 2011, 4:14 AM

Merged Changes

e10ba1ab720c Merge branch 'bug/2.6.next/5755-gc-issue' into 2.6.next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
c469f9930156 Merge branch 'docs/2.6.next/inspect-help' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
f108f0330623 (#6018) Nick F's --help text for puppet inspect.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
69600bea8a5c Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into 2.6.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
04ea8269e70e (#5823) document the not-an-API status of set_run_mode
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
7a061409bd04 Merge branch 'bug/2.6.next/5823-allow-run-mode-to-cut-your-hand-off' into 2.6.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
4ff5769119ae (#5823) run mode can now be set dynamically...
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
81876a6afd75 Merge branch 'ticket/2.6.next/6114' into 2.6.next
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
bddfa1e22d8d (6114) Update the audit metaparameter for 2.6.5.
Author
nfagerlund <nick.fagerlund@gmail.com>
Browse Repository
No Builds
No Audits
ac8d316a08cf Fix for #5755 -- making zaml serialization robust over projected objects
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
0502c557cbe8 Merge branch 'bug/2.6.next/4139-autoflush-doesn't' into 2.6.next
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
c912a2af2f63 (#4139) hook log autoflush into global defaults
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

lib/

puppet/

application/

util/

log/

destinations.rb

spec/

unit/

application_spec.rb

util/

log/

destinations_spec.rb

rPUec4254dec20c

lib/puppet/application.rb

Loading...

lib/puppet/application/inspect.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/type.rb

Loading...

lib/puppet/util/log.rb

Loading...

lib/puppet/util/log/destinations.rb

Loading...

lib/puppet/util/zaml.rb

Loading...

spec/unit/application_spec.rb

Loading...

spec/unit/util/log/destinations_spec.rb

Loading...

spec/unit/util/log_spec.rb

Loading...