Merge commit '2.6.1rc4' into next
9e72ccd8ff08Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge commit '2.6.1rc4' into next

Details

Provenance

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

Parents

rPU1d93c4dd8618: Merge remote branch 'paul/ticket/next/4685' into next
rPUefa834aaec59: Updated CHANGELOG for 2.6.1rc4

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU9e72ccd8ff08: Merge commit '2.6.1rc4' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Sep 14 2010, 8:00 AM

Merged Changes

efa834aaec59 Updated CHANGELOG for 2.6.1rc4
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
763e7cb6f3f8 Minimal fix for #4691 -- class name uppercased in $name
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
4a9c85763b7b Fix for #4693 -- implicit stages should never be serialized
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
fa4d32cfd7b3 Fix for #4646 -- Missing stub
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
4d55c6e72f25 Fix for tests broken by fix for #4489 -- stub standalone
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
b397b698314d Fix for #4489 -- apply was using the rest terminus
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
e91a8cc97521 [#4462] uncaught Timeout::Error
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
4d36a5152ac8 Fixed alias metaparam docs error
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
b06363549a8c Skip apt-listbugs and apt-listchanges when installing from puppet
Author
Dean Wilson <dean.wilson@gmail.com>
Browse Repository
No Builds
No Audits
e860907724ed [#4660] Avoid passing rake and autotest args to puppet tests
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
419e007b3daa Fixed #4706 - logcheck patterns
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
f6c0265f4e7e Fixed queue require for #4555
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
07d0be4684f7 [#4308] Remove puppettest from specs
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
9e6961642378 Fixed RSpec warning messages
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
8d248616c6dd Fixed #4100 - Added http_caching to yumrepo type
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
8cd266e6d421 Added cost parameter to the yumrepo type
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
0056d4174959 Fixed extlookup documentation and spacing
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
e783a16fbc2c Fix for #4506 -- too much data being serialized
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
f59cfc8533e2 Fixed terminus example documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
690465ef3434 Fix #4615 - vim highlighting fails on slashes and colons.
Author
Marc Fournier <marc.fournier@camptocamp.com>
Browse Repository
No Builds
No Audits
078e4fd07ff1 Updated man pages
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
7548c65a4e7e Updated Man page generation since move to Markdown
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits

Changes (47)

Path

Size

CHANGELOG

ext/

logcheck/

puppet

vim/

syntax/

puppet.vim

install.rb

lib/

puppet/

agent.rb

application/

queue.rb

indirector/

node/

parser/

functions/

provider/

package/

apt.rb

resource.rb

resource/

type.rb

type/

file/

content.rb

source.rb

yumrepo.rb

man/

man5/

man8/

spec/

integration/

provider/

mailalias/

aliases_spec.rb

monkey_patches/

add_confine_and_runnable_to_rspec_dsl.rb

publicize_methods.rb

spec_helper.rb

unit/

application/

apply_spec.rb

cert_spec.rb

master_spec.rb

network/

http/

webrick/

rest_spec.rb

parser/

lexer_spec.rb

provider/

ssh_authorized_key/

parsed_spec.rb

reports/

tagmail_spec.rb

type/

file/

content_spec.rb

util/

backups_spec.rb

test/

lib/

puppettest/

support/

rPU9e72ccd8ff08

View Options

CHANGELOG

View Options

ext/logcheck/puppet

View Options

ext/vim/syntax/puppet.vim

View Options

install.rb

View Options

lib/puppet/agent.rb

View Options

lib/puppet/application/queue.rb

View Options

lib/puppet/indirector/node/exec.rb

View Options

lib/puppet/indirector/node/ldap.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/functions/extlookup.rb

View Options

lib/puppet/parser/functions/require.rb

View Options

lib/puppet/provider/package/apt.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/file/content.rb

View Options

lib/puppet/type/file/source.rb

View Options

lib/puppet/type/yumrepo.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/integration/provider/mailalias/aliases_spec.rb

View Options

spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb

View Options

spec/monkey_patches/publicize_methods.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/application/apply_spec.rb

View Options

spec/unit/application/cert_spec.rb

View Options

spec/unit/application/master_spec.rb

View Options

spec/unit/network/http/webrick/rest_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

View Options

spec/unit/reports/tagmail_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/util/backups_spec.rb

View Options

test/lib/mocha_standalone.rb

View Options

test/lib/puppettest.rb

View Options

test/lib/puppettest/fakes.rb

View Options

test/lib/puppettest/support/assertions.rb

View Options

test/lib/puppettest/support/utils.rb

Merge commit '2.6.1rc4' into next9e72ccd8ff08UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (47)

rPU9e72ccd8ff08

CHANGELOG

ext/logcheck/puppet

ext/vim/syntax/puppet.vim

install.rb

lib/puppet/agent.rb

lib/puppet/application/queue.rb

lib/puppet/indirector/node/exec.rb

lib/puppet/indirector/node/ldap.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/functions/extlookup.rb

lib/puppet/parser/functions/require.rb

lib/puppet/provider/package/apt.rb

lib/puppet/resource.rb

lib/puppet/resource/type.rb

lib/puppet/type.rb

lib/puppet/type/file/content.rb

lib/puppet/type/file/source.rb

lib/puppet/type/yumrepo.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/integration/provider/mailalias/aliases_spec.rb

spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb

spec/monkey_patches/publicize_methods.rb

spec/spec_helper.rb

spec/unit/application/apply_spec.rb

spec/unit/application/cert_spec.rb

spec/unit/application/master_spec.rb

spec/unit/network/http/webrick/rest_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

spec/unit/reports/tagmail_spec.rb

spec/unit/type/file/content_spec.rb

spec/unit/util/backups_spec.rb

test/lib/mocha_standalone.rb

test/lib/puppettest.rb

test/lib/puppettest/fakes.rb

test/lib/puppettest/support/assertions.rb

test/lib/puppettest/support/utils.rb

Merge commit '2.6.1rc4' into next
9e72ccd8ff08Unpublished
Actions