Merge branch 'next'
2b8e834fcbc5Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

This marks the end of the agile iteration from 11/3-11/10.

Details

Provenance

Paul Berry <paul@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU275a224ee245: Merge remote branch 'masterzen/tickets/2.6.x/5023' into next
rPU7236a33d6c5c: Merge branch 'next'

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2010-11-10

Event Timeline

Paul Berry <paul@puppetlabs.com> committed rPU2b8e834fcbc5: Merge branch 'next' (authored by Paul Berry <paul@puppetlabs.com>).Nov 11 2010, 1:06 AM

Merged Changes

275a224ee245 Merge remote branch 'masterzen/tickets/2.6.x/5023' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
e62870f63c63 Merge branch 'feature/master/5198' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
04515cfb1230 (#5198) Added a spec test for new TB unit
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
0f5c57f0f818 Merge remote branch 'jamtur01/tickets/2.6.x/5108' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
777d19ec4861 Merge remote branch 'jeffmccune/ticket/2.6.x/5062' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
1d708a67c7db Merge commit '2.6.3rc2' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
80adb39d1f4e Merge commit '2.6.3rc2' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
22d81f0b319b Merge branch 'ticket/next/5150' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
2279fe12b32b Merge branch 'maint/next/add_local_branch_to_mail_patches' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
631c5a8e4558 Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
0aab84ffa672 Merge branch 'maint/next/clean_up_agent_spec' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
a54850328bde Merge branch 'maint/next/missing_fileserver_requires' into next
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
2ec1b552e24d Maint: Added missing requires to fileserver.rb.
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
f0a146766a84 Maint: remove unnecessary stubbing from agent_spec
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
442a2e6b81f8 Merge branch 'maint/next/forkbomb' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
5c2457952660 maint: prevent fork bombs by disabling ActiveSupport's Kernel.daemonize
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
04fb78c91196 Merge branch 'feature/next/cert_inspector' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
f8d1427379f1 maint: First draft of cert inspector
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
4506dfeab3ee (#5150) Make fact REST terminus configurable to connect to inventory service
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
555d6bc671a1 Bookkeeping: Merge commit '9e2a0e4' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
71a0ceadffc8 (#5198) add terabyte support to tidy type's size parameter
Author
Garrett Honeycutt <puppet-dev@garretthoneycutt.com>
Browse Repository
No Builds
No Audits
91ac1629dbef (#5198) add gigabyte reference to docs for tidy type's size parameter
Author
Garrett Honeycutt <puppet-dev@garretthoneycutt.com>
Browse Repository
No Builds
No Audits
244213c856f3 Updated CHANGELOG for 2.6.3rc2
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
76ac1f88ce2a Fixed #5112 - Launchd Service broke in 2.6.2 with OS X 10.4 Clients.
Author
donavan <donavan@desinc.net>
Browse Repository
No Builds
No Audits
776ea2a17de7 Fixed #5137 - Removed no longer required TOC references
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
31118fe85aca Kludge for #5048 -- serialization compatibility with 0.25.x
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
65ef24e5c1c3 (#4534/#4778) -- Normalize parameterized classes
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
7d35a479b760 Fixed to #5108 - Change default of service hasstatus property to true
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
4d1681e05a18 (#5062) Add envpuppet helper script to ext/
Author
Jeff McCune <jeff@puppetlabs.com>
Browse Repository
No Builds
No Audits
3b53bfcd0dd2 Fix for #5022 -- Escaped newlines should be elided
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
f2537d8f913f Puppet-load: better and safer error reporting
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
ce1865f3d0bd Fix #5023 - puppet-load multiple nodes support
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits

Changes (25)

Path

Size

ext/

lib/

puppet/

defaults.rb

indirector/

facts/

rest.rb

network/

handler/

fileserver.rb

parser/

ast/

resource.rb

compiler.rb

lexer.rb

provider/

service/

resource/

type/

util/

spec/

unit/

application/

agent_spec.rb

parser/

ast/

resource/

type/

tasks/

rake/

git_workflow.rake

rPU2b8e834fcbc5

View Options

CHANGELOG

View Options

ext/cert_inspector

View Options

ext/envpuppet

View Options

ext/puppet-load.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/indirector/facts/rest.rb

View Options

lib/puppet/network/handler/fileserver.rb

View Options

lib/puppet/parser/ast/resource.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/type/service.rb

View Options

lib/puppet/type/tidy.rb

View Options

lib/puppet/util/monkey_patches.rb

View Options

lib/puppet/util/reference.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/parser/ast/resource_spec.rb

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/resource/type_spec.rb

View Options

spec/unit/type/service_spec.rb

View Options

spec/unit/type/tidy_spec.rb

View Options

tasks/rake/git_workflow.rake

Merge branch 'next'2b8e834fcbc5UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (25)

rPU2b8e834fcbc5

CHANGELOG

ext/cert_inspector

ext/envpuppet

ext/puppet-load.rb

lib/puppet/defaults.rb

lib/puppet/indirector/facts/rest.rb

lib/puppet/network/handler/fileserver.rb

lib/puppet/parser/ast/resource.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/lexer.rb

lib/puppet/provider/service/launchd.rb

lib/puppet/resource.rb

lib/puppet/resource/type.rb

lib/puppet/type/service.rb

lib/puppet/type/tidy.rb

lib/puppet/util/monkey_patches.rb

lib/puppet/util/reference.rb

spec/unit/application/agent_spec.rb

spec/unit/parser/ast/resource_spec.rb

spec/unit/parser/compiler_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/resource/type_spec.rb

spec/unit/type/service_spec.rb

spec/unit/type/tidy_spec.rb

tasks/rake/git_workflow.rake

Merge branch 'next'
2b8e834fcbc5Unpublished
Actions