Paths

Table of Contentst

Diffusion puppet 9e2a0e41dfb2

Merge commit '85543a4'
9e2a0e41dfb2Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge commit '85543a4'

This updates master to the pre-agile-iteration state.

Details

Provenance

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

Parents

rPU85543a419789: Merge remote branch 'nigel/tickets/2.6.x/4382' into next
rPUb1ef091d0209: Merge commit '2.6.3rc1'

Branches

Unknown

Tags

Unknown

Event Timeline

Jesse Wolfe <jes5199@gmail.com> committed rPU9e2a0e41dfb2: Merge commit '85543a4' (authored by Jesse Wolfe <jes5199@gmail.com>).Nov 4 2010, 3:59 AM

Merged Changes

85543a419789 Merge remote branch 'nigel/tickets/2.6.x/4382' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
19ae3dffa4e5 Merge commit '2.6.3rc1' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
2d13fdaac56b Merge commit '2.6.2' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
efeb2f4d8d62 Make --mkusers work on OS X, we now find unused uid/gids if unspecified like…
Author
Nigel Kersten <nigelk@google.com>
Browse Repository
No Builds
No Audits
e6c829617ccc Merge remote branch 'paul/ticket/next/4657' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
7bdbd132634f Merge commit '2.6.2rc1' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
163ec172e06a Partial merge to 2.6.2rc1 : Merge commit '574812e' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
c9592f048331 Partial merge to 2.6.2rc1 : Merge commit '021359b' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6acfdba87bdf Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6dd1930ff66f Fix test failures that fixing #4726 exposed.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1a00c07971c4 Partial merge to 2.6.2rc1 : Merge commit '66cf3a9' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
d43f7996b93c Partial merge to 2.6.2rc1 : Merge commit '99c1019' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
ce9a6f97ab17 Partial merge to 2.6.2rc1 : Merge commit '8cd1540' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
c6e824ad5144 Partial merge to 2.6.2rc1 : Merge commit 'f950061' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
2e189d516643 Partial merge to 2.6.2rc1 : Merge commit '8ff4b9a' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
4dbff92f1cc1 Partial merge to 2.6.2rc1 : Merge commit '2b50f30' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
3c34ea626877 Partial merge to 2.6.2rc1 : Merge commit '7b8cb74' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9e66daa27ce6 Merge commit '2.6.1' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
9e72ccd8ff08 Merge commit '2.6.1rc4' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1d93c4dd8618 Merge remote branch 'paul/ticket/next/4685' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6860594c4d95 Merge remote branch 'paul/ticket/next/4638' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
f62095749a14 Merge remote branch 'paul/ticket/next/3782' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
4bda0b53c7b3 Merge remote branch 'paul/ticket/next/4570' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
ce9bf1edcaac Modified the error message that is generated when a class, definition, or node…
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
6b278503021c [#4657] Customer-supplied .rb files are not compatible with multiple…
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
25048ecc40db [#4685] Classes, defines, and nodes allowed inside of non-evaluated conditionals
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
1ba536eb533e [3782] Test isolation problem in test/ral/providers/cron/crontab.rb
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb9034731dda Merge commit '2.6.1rc3' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
df088c9ba16d [4638] Cleanup of plurals and inheritance relationships in AST
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
50fd9b77cdb2 Fixed issue #4570 (Race conditions when serializing objects to YAML).
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
16f701edd89a Merge remote branch 'paul/4472-4483-4496-4521-4522'
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
4da88fb4cd57 [#4496]+[#4521]+[#4522] Add structures to the AST to represent type definitions…
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
caca187dffbd Moved perform_initial_import from Puppet::Resource::TypeCollection to Puppet…
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
3c090de39897 This is a bookkeeping merge that produces no code-change
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
6b1dd81799a4 [#4472]+[#4483] Moved type-name resolution out of Puppet::Parser::TypeLoader.
Author
Paul Berry <paul@puppetlabs.com>
Browse Repository
No Builds
No Audits
6dbd47712651 [#4397]+[#4344] Move type-name resolution out of Puppet::Resource into the AST…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits

Changes (49)

Path

Size

lib/

puppet/

dsl/

node/

parser/

ast/

top_level_construct.rb

provider/

nameservice/

directoryservice.rb

resource/

type.rb

type_collection.rb

util/

rdoc/

parser.rb

zaml.rb

spec/

integration/

parser/

collector_spec.rb

compiler_spec.rb

parser_spec.rb

unit/

application/

apply_spec.rb

master_spec.rb

dsl/

resource_type_api_spec.rb

node/

environment_spec.rb

parser/

ast/

resource/

type_collection_spec.rb

type_spec.rb

util/

rdoc/

parser_spec.rb

zaml_spec.rb

test/

language/

functions.rb

parser.rb

scope.rb

lib/

puppettest/

parsertesting.rb

other/

report.rb

rails/

railsparameter.rb

ral/

providers/

cron/

crontab.rb

util/

metrics.rb

rPU9e2a0e41dfb2

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/dsl/resource_type_api.rb

View Options

lib/puppet/node/environment.rb

View Options

lib/puppet/parser/ast.rb

View Options

lib/puppet/parser/ast/astarray.rb

View Options

lib/puppet/parser/ast/caseopt.rb

View Options

lib/puppet/parser/ast/definition.rb

View Options

lib/puppet/parser/ast/hostclass.rb

View Options

lib/puppet/parser/ast/node.rb

View Options

lib/puppet/parser/ast/resource.rb

View Options

lib/puppet/parser/ast/resource_instance.rb

View Options

lib/puppet/parser/ast/resource_override.rb

View Options

lib/puppet/parser/ast/top_level_construct.rb

View Options

lib/puppet/parser/grammar.ra

View Options

lib/puppet/parser/parser.rb

View Options

lib/puppet/parser/parser_support.rb

View Options

lib/puppet/parser/type_loader.rb

View Options

lib/puppet/provider/nameservice/directoryservice.rb

View Options

lib/puppet/resource/type.rb

View Options

lib/puppet/resource/type_collection.rb

View Options

lib/puppet/util/rdoc/parser.rb

View Options

lib/puppet/util/zaml.rb

View Options

spec/integration/parser/collector_spec.rb

View Options

spec/integration/parser/compiler_spec.rb

View Options

spec/integration/parser/parser_spec.rb

View Options

spec/unit/application/apply_spec.rb

View Options

spec/unit/application/master_spec.rb

View Options

spec/unit/dsl/resource_type_api_spec.rb

View Options

spec/unit/node/environment_spec.rb

View Options

spec/unit/parser/ast/astarray_spec.rb

View Options

spec/unit/parser/ast/definition_spec.rb

View Options

spec/unit/parser/ast/hostclass_spec.rb

View Options

spec/unit/parser/ast/node_spec.rb

View Options

spec/unit/parser/ast/resource_spec.rb

View Options

spec/unit/parser/parser_spec.rb

View Options

spec/unit/parser/scope_spec.rb

View Options

spec/unit/parser/type_loader_spec.rb

View Options

spec/unit/resource/type_collection_spec.rb

View Options

spec/unit/resource/type_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

View Options

spec/unit/util/zaml_spec.rb

View Options

test/language/functions.rb

View Options

test/language/parser.rb

View Options

test/language/scope.rb

View Options

test/lib/puppettest/parsertesting.rb

View Options

test/other/report.rb

View Options

test/rails/railsparameter.rb

View Options

test/ral/providers/cron/crontab.rb

View Options

Merge commit '85543a4'9e2a0e41dfb2UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (49)

rPU9e2a0e41dfb2

lib/puppet/defaults.rb

lib/puppet/dsl/resource_type_api.rb

lib/puppet/node/environment.rb

lib/puppet/parser/ast.rb

lib/puppet/parser/ast/astarray.rb

lib/puppet/parser/ast/caseopt.rb

lib/puppet/parser/ast/definition.rb

lib/puppet/parser/ast/hostclass.rb

lib/puppet/parser/ast/node.rb

lib/puppet/parser/ast/resource.rb

lib/puppet/parser/ast/resource_instance.rb

lib/puppet/parser/ast/resource_override.rb

lib/puppet/parser/ast/top_level_construct.rb

lib/puppet/parser/grammar.ra

lib/puppet/parser/parser.rb

lib/puppet/parser/parser_support.rb

lib/puppet/parser/type_loader.rb

lib/puppet/provider/nameservice/directoryservice.rb

lib/puppet/resource/type.rb

lib/puppet/resource/type_collection.rb

lib/puppet/util/rdoc/parser.rb

lib/puppet/util/zaml.rb

spec/integration/parser/collector_spec.rb

spec/integration/parser/compiler_spec.rb

spec/integration/parser/parser_spec.rb

spec/unit/application/apply_spec.rb

spec/unit/application/master_spec.rb

spec/unit/dsl/resource_type_api_spec.rb

spec/unit/node/environment_spec.rb

spec/unit/parser/ast/astarray_spec.rb

spec/unit/parser/ast/definition_spec.rb

spec/unit/parser/ast/hostclass_spec.rb

spec/unit/parser/ast/node_spec.rb

spec/unit/parser/ast/resource_spec.rb

spec/unit/parser/parser_spec.rb

spec/unit/parser/scope_spec.rb

spec/unit/parser/type_loader_spec.rb

spec/unit/resource/type_collection_spec.rb

spec/unit/resource/type_spec.rb

spec/unit/util/rdoc/parser_spec.rb

spec/unit/util/zaml_spec.rb

test/language/functions.rb

test/language/parser.rb

test/language/scope.rb

test/lib/puppettest/parsertesting.rb

test/other/report.rb

test/rails/railsparameter.rb

test/ral/providers/cron/crontab.rb

test/util/metrics.rb

Merge commit '85543a4'
9e2a0e41dfb2Unpublished
Actions