Merge branch 'next'
d5db8db116afUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

This synchronizes the 2.7 master branch with 2.6.1RC1

Details

Provenance

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

Parents

rPUb53e7d78e2e8: Merge commit '2.6.1rc1' into next
rPU865282ae7b93: Fixed example config.ru

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPUd5db8db116af: Merge branch 'next' (authored by Jesse Wolfe <jes5199@gmail.com>).Jul 27 2010, 7:20 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

b53e7d78e2e8 Merge commit '2.6.1rc1' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
ecf44e4408c1 Updated CHANGELOG for 2.6.1rc1
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
bdfcac5c9c44 Update Red Hat spec file for 2.6.0
Author
Todd Zullinger <tmz@pobox.com>
Browse Repository
No Builds
No Audits
9f08e7c1e492 Feature: puppet-load - a tool to stress-test master compilation
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
ef9a4a6df163 Fix #4245 - default insertion of ACL is not thread safe
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
4065e81f7602 Fix race condition in rack autoloading of request/response
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
3163932f70e8 Fix #4244 - Cached Attributes is not thread safe
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
7d42f77b83a7 JRuby doesn't implement Process.maxgroups
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
760e418d254a Fix #4349 - Parsing with ignoreimport=true was always loading site.pp
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
67bdf89ac91a Fix #4348 - Puppet doc single manifest broken
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
13c71b97d93e extlookup() is a builtin
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
d38e52224f19 [#4333] old optparse doesn't support default_argv=
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
86b0882c8a77 Fixed #4326 - Updated SUSE packaging
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
03313b81c696 Fix #4319 - source file url sent to the master is invalid
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
ac3a0d2d6c10 vim: highlight default parameters in definition/classes
Author
Marc Fournier <marc.fournier@camptocamp.com>
Browse Repository
No Builds
No Audits
be2141a6e37f vim: match collected resources.
Author
Marc Fournier <marc.fournier@camptocamp.com>
Browse Repository
No Builds
No Audits
c047c8d38f5f vim: added elsif
Author
Marc Fournier <marc.fournier@camptocamp.com>
Browse Repository
No Builds
No Audits
9569136329f8 Fix for 4314 -- Need to allow '-' in class name for refs
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
636079f11403 Fixed #4304 - Changed logging level for auto import message
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
000fd1e83782 Fix for #4303 -- reverting to old escaping in '-strings
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
1d494a3104e9 Tweak to fix for #4302--dangling ref to known_resource_types
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
23830504dfeb Fix #4302 - Compilation speed regression compared to 2.6
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
63ec207cc888 Minimal fix for #4297, with notes for follow-up
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
7ad7eb12fade Fix #4286 - rename puppetdoc global module <site> to __site__
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
28bb1950cf04 Fixed yumrepo type deprecation wanring `
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
067a46db27a7 Temporary tweak to tests for #4242
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
9778f2a47922 [#4242] Fixed recursion due to parents including their children
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
59a23d69c20a Fix for #3382 -- Empty classes as graph placeholders
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
94edd404130b Merge commit 'tags/2.6.0' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
2af27160b94e Merge branch 'master' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
21efa7b28208 Merge branch 'master' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9caa04fd3635 Merge branch '0.25.x' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
83d9874e2eba Use the name in the search path for looking for metadata
Author
Bryan Kearney <bkearney@redhat.com>
Browse Repository
No Builds
No Audits
70c293abd1b1 Fix for environments in startup script. - Dropped the forced --manifest switch…
Author
Ken Barber <ken@bob.sh>
Browse Repository
No Builds
No Audits
62bc09e0f551 Redmine: 2474 - Fix for mount fstype documentation
Author
Steven Jenkins <steven@endpoint.com>
Browse Repository
No Builds
No Audits
7faf27ce72d4 [#4064] Modify confine to also allow a message and a block containing the test.
Author
Rein Henrichs <rein@puppetlabs.com>
Browse Repository
No Builds
No Audits
e4b3aacd7856 [#4063] Add confine to describe block that depends on ActiveRecord
Author
Rein Henrichs <rein@puppetlabs.com>
Browse Repository
No Builds
No Audits
97936c6d3fa3 [#3921] Add facts_terminus setting to Puppet settings
Author
Rein Henrichs <rein@puppetlabs.com>
Browse Repository
No Builds
No Audits
db39b7c0848f [#4026] When --use_cached_catalog is specified on a puppetd run actully use the…
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
428683917e48 [#4001] Added explicit check and error message when creating a file if parent…
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
34d189725c82 [#3835] Fixed recursively absent directories improperly managing their files
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d0d94c27174 [#3804] Fixed one failing spec for RackREST
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
da66e1602a87 Fixing #3651 failing to pop comment stack for some constructs
Author
Markus Roberts <Markus@reality.com>
Browse Repository
No Builds
No Audits
069bf1b4a9cd Fixed require warning documentation
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
23431da08795 Fixed mcx documentation error
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
705cfe119ca5 Documentation fixes
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
0a0923c96365 [#4006] Fix test failures caused by reverting ticket 2890
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
8faa4663a4d7 [#3866] Rename the method metaclass to singleton_class to avoid the deprecation…
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
53e361044cd6 Bug 3731. Applied Fix suggested by Doug Warner to always flatten out the array
Author
Bryan Kearney <bkearney@redhat.com>
Browse Repository
No Builds
No Audits
b9aba7ce6545 maint: Have 'rake spec' output in color
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (43)

Path

Size

CHANGELOG

conf/

redhat/

suse/

	suse/
	redhat/

ext/

vim/

syntax/

puppet.vim

lib/

puppet/

application.rb

network/

http/

node/

parser/

resource/

type/

file/

util/

rdoc/

	lib/	puppet/	parser/	functions/
				ext/

extlookup.rb

spec/

unit/

application_spec.rb

node/

environment_spec.rb

parser/

functions/

extlookup_spec.rb

include_spec.rb

lexer_spec.rb

resource/

type_collection_spec.rb

simple_graph_spec.rb

type/

file/

content_spec.rb

util/

rdoc/

parser_spec.rb

rdoc_spec.rb

rPUd5db8db116af

View Options

CHANGELOG

View Options

conf/redhat/puppet.spec

View Options

conf/suse/client.init

View Options

conf/suse/fileserver.conf

View Options

conf/suse/logrotate

View Options

conf/suse/puppet.conf

View Options

conf/suse/puppet.spec

View Options

conf/suse/puppet.suse.patch

View Options

conf/suse/ruby-env.patch

View Options

conf/suse/server.init

View Options

ext/extlookup.rb

View Options

ext/puppet-load.rb

View Options

ext/vim/syntax/puppet.vim

View Options

lib/puppet/application.rb

View Options

lib/puppet/network/http/rack.rb

View Options

lib/puppet/network/rest_authconfig.rb

View Options

lib/puppet/node/environment.rb

View Options

lib/puppet/parser/compiler.rb

View Options

lib/puppet/parser/functions/extlookup.rb

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/parser/resource.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/resource/type_collection.rb

View Options

lib/puppet/simple_graph.rb

View Options

lib/puppet/type/file/content.rb

View Options

lib/puppet/type/whit.rb

View Options

lib/puppet/type/yumrepo.rb

View Options

lib/puppet/util/cacher.rb

View Options

lib/puppet/util/monkey_patches.rb

View Options

lib/puppet/util/rdoc.rb

View Options

lib/puppet/util/rdoc/parser.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/node/environment_spec.rb

View Options

spec/unit/parser/functions/extlookup_spec.rb

View Options

spec/unit/parser/functions/include_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/resource/type_collection_spec.rb

View Options

spec/unit/simple_graph_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

View Options

spec/unit/util/rdoc_spec.rb

Merge branch 'next'd5db8db116afUnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (43)

rPUd5db8db116af

CHANGELOG

conf/redhat/puppet.spec

conf/suse/client.init

conf/suse/fileserver.conf

conf/suse/logrotate

conf/suse/puppet.conf

conf/suse/puppet.spec

conf/suse/puppet.suse.patch

conf/suse/ruby-env.patch

conf/suse/server.init

ext/extlookup.rb

ext/puppet-load.rb

ext/vim/syntax/puppet.vim

lib/puppet/application.rb

lib/puppet/network/http/rack.rb

lib/puppet/network/rest_authconfig.rb

lib/puppet/node/environment.rb

lib/puppet/parser/compiler.rb

lib/puppet/parser/functions/extlookup.rb

lib/puppet/parser/lexer.rb

lib/puppet/parser/resource.rb

lib/puppet/parser/type_loader.rb

lib/puppet/resource/catalog.rb

lib/puppet/resource/type.rb

lib/puppet/resource/type_collection.rb

lib/puppet/simple_graph.rb

lib/puppet/type/file/content.rb

lib/puppet/type/whit.rb

lib/puppet/type/yumrepo.rb

lib/puppet/util/cacher.rb

lib/puppet/util/monkey_patches.rb

lib/puppet/util/rdoc.rb

lib/puppet/util/rdoc/parser.rb

spec/unit/application_spec.rb

spec/unit/node/environment_spec.rb

spec/unit/parser/functions/extlookup_spec.rb

spec/unit/parser/functions/include_spec.rb

spec/unit/parser/lexer_spec.rb

spec/unit/resource/type_collection_spec.rb

spec/unit/simple_graph_spec.rb

spec/unit/type/file/content_spec.rb

spec/unit/util/rdoc/parser_spec.rb

spec/unit/util/rdoc_spec.rb

Merge branch 'next'
d5db8db116afUnpublished
Actions