Merge branch 'master' into next
2af27160b94eUnpublished
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 RC4

Details

Provenance

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

Parents

rPUd87a2e39d1a6: Updated CHANGELOG for 2.6.0RC4
rPU21efa7b28208: Merge branch 'master' into next

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU2af27160b94e: Merge branch 'master' into next (authored by Jesse Wolfe <jes5199@gmail.com>).Jul 20 2010, 4:59 AM

Merged Changes

d87a2e39d1a6 Updated CHANGELOG for 2.6.0RC4
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
cf597d72dca2 [#4233] Ruby regexps are not multiline by default, but Resource titles can be…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
d6cbb2198e06 Fix for #4234 -- ruby DSL fails on second resource
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
4822de3f95e0 Fix for #4236 -- Only interpolate $ if followed by a variable
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
b509032e559c Fix #4238 - if should match undef as ''
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
8c8c1469ae9f Minimal fix for #4243 -- import isn't thread safe
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
d319da41e46f [#4247] storeconfigs was calling Puppet::Parser::Resource.new with the wrong…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9f915402f5cf [#4256] External nodes parameters can now be assigned to nodes
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
680dd1ace4b6 Fix for #4257 -- problems resolving ::-prefixed classes
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
6e07a199011b Fix #4262 - Puppetmaster used to log compilation time
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
5b68afe0be7a Fix for #4255 -- misleading diagnostic message
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
dd03ac9fa29f Partial fix for #4278 -- the performance aspects
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
4ce33fde2c0d Fixed #4249 - Updated SUSE packaging specifications
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits

Changes (33)

Path

Size

CHANGELOG

conf/

suse/

client.init

puppet.spec

server.init

lib/

puppet/

dsl/

resource_api.rb

indirector/

catalog/

compiler.rb

node.rb

parser/

ast/

comparison_operator.rb

rails/

resource/

type/

file/

spec/

unit/

indirector/

catalog/

compiler_spec.rb

node/

exec_spec.rb

parser/

ast/

comparison_operator_spec.rb

rails/

resource/

type/

rPU2af27160b94e

View Options

CHANGELOG

View Options

conf/suse/client.init

View Options

conf/suse/puppet.spec

View Options

conf/suse/server.init

View Options

lib/puppet/dsl/resource_api.rb

View Options

lib/puppet/indirector/catalog/compiler.rb

View Options

lib/puppet/node.rb

View Options

lib/puppet/parser/ast/comparison_operator.rb

View Options

lib/puppet/parser/ast/leaf.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/parser/parser_support.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/rails/resource.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/resource/type_collection.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/source.rb

View Options

spec/unit/indirector/catalog/compiler_spec.rb

View Options

spec/unit/indirector/node/exec_spec.rb

View Options

spec/unit/parser/ast/comparison_operator_spec.rb

View Options

spec/unit/parser/ast/leaf_spec.rb

View Options

spec/unit/parser/compiler_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/parser/type_loader_spec.rb

View Options

spec/unit/rails/resource_spec.rb

View Options

spec/unit/resource/catalog_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

Merge branch 'master' into next2af27160b94eUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (33)

rPU2af27160b94e

CHANGELOG

conf/suse/client.init

conf/suse/puppet.spec

conf/suse/server.init

lib/puppet/dsl/resource_api.rb

lib/puppet/indirector/catalog/compiler.rb

lib/puppet/node.rb

lib/puppet/parser/ast/comparison_operator.rb

lib/puppet/parser/ast/leaf.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/lexer.rb

lib/puppet/parser/parser_support.rb

lib/puppet/parser/resource.rb

lib/puppet/parser/type_loader.rb

lib/puppet/rails/resource.rb

lib/puppet/resource.rb

lib/puppet/resource/catalog.rb

lib/puppet/resource/type_collection.rb

lib/puppet/type.rb

lib/puppet/type/file.rb

lib/puppet/type/file/source.rb

spec/unit/indirector/catalog/compiler_spec.rb

spec/unit/indirector/node/exec_spec.rb

spec/unit/parser/ast/comparison_operator_spec.rb

spec/unit/parser/ast/leaf_spec.rb

spec/unit/parser/compiler_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/parser/type_loader_spec.rb

spec/unit/rails/resource_spec.rb

spec/unit/resource/catalog_spec.rb

spec/unit/resource_spec.rb

spec/unit/type/file_spec.rb

spec/unit/type_spec.rb

Merge branch 'master' into next
2af27160b94eUnpublished
Actions