HomePhorge
Diffusion puppet 7e71840e29cb

Merge branch 'next'
7e71840e29cbUnpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

  • next: (198 commits) (#6722) load all functions before testing... Updated CHANGELOG for 2.6.7rc1 (#5073) Download plugins even if you're filtering on tags Fix #5610: Prevent unnecessary RAL lookups Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next" (#6723) Fix withenv environment restoration bug (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord Remove extra trailing whitespace from lib/puppet/resource.rb (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs (#6707) Fix typo in rest_authconfig.rb (#6689) Make inventory_active_record terminus search quickly (#5479) Test that we auto-require the zone dataset. (#5479) Autorequire zfs filesystem when zone dataset is configured (#5392) Give a better error when realizing a non-existant resource (#2645) Adding a less-stubby test to verify the "system" attribute's behavior Update CHANGELOG for 2.6.6 maint: Remove serialization of InventoryFact values maint: Rename InventoryHost to InventoryNode (#6441) Add mount fixture for AIX's /etc/filesystems Fixed #2645 - Added support for creating system users ...

Details

Provenance
Matt Robinson <matt@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU2ae88067492f: Merge branch '2.6.x' into next
rPUea348761df0b: Merge branch 'next'
Branches
Unknown
Tags
Unknown
References
tag: Iteration-2011-03-16-master

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPU7e71840e29cb: Merge branch 'next' (authored by Matt Robinson <matt@puppetlabs.com>).Mar 18 2011, 10:41 PM

Merged Changes

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

Changes (301)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
PathSize
conf/
solaris/
smf/
examples/
etc/
init.d/
modules/
sample-module/
ext/
lib/
puppet/
application/
configurer/
external/
nagios/
file_bucket/
indirector/
facts/
facts/
inventory/
file_bucket_file/
network/
http/
api/
rack/
node/
parser/
ast/
functions/
provider/
computer/
mount/
service/
user/
zpool/
rails/
database/
reference/
reports/
type/
file/
util/
log/
rdoc/
generators/
man/
man5/
man8/
spec/
fixtures/
unit/
provider/
mount/
integration/
parser/
provider/
mailalias/
type/
lib/
puppet_spec/
shared_behaviours/
unit/
application/
configurer/
file_bucket/
indirector/
facts/
file_bucket_file/
network/
handler/
http/
api/
parser/
ast/
functions/
provider/
host/
mount/
ssh_authorized_key/
user/
zpool/
reports/
type/
file/
util/
log/
rdoc/
spec/
fixtures/
test/
integration/
provider/
mailalias/
data/
providers/
mailalias/
unit/
data/
provider/
providers/
provider/
mount/
parsed/
types/
mount/
netbsd.fstab
freebsd.fstab
reports/
tagmail/
reports/
fixtures/
unit/
parser/
lexer/
test/
data/
snippets/
argumentdefaults.pp
argumentdefaults
classpathtest.pp
classpathtest
filecreate.pp
filecreate
implicititeration.pp
implicititeration
multipleinstances.pp
multipleinstances
namevartest.pp
namevartest
scopetest.pp
scopetest
simpledefaults.pp
simpledefaults
simpleselector.pp
simpleselector
tasks/
rake/
test/
data/
providers/
mount/
types/
mount/
ral/
type/

rPU7e71840e29cb

View Options

README.queueing

View Options

conf/solaris/smf/svc-puppetd

View Options

conf/solaris/smf/svc-puppetmasterd

View Options

examples/etc/init.d/sleeper

View Options

examples/modules/sample-module/README.txt

View Options

ext/puppetstoredconfigclean.rb

View Options

lib/puppet/application.rb

View Options

lib/puppet/application/agent.rb

View Options

lib/puppet/application/apply.rb

View Options

lib/puppet/application/cert.rb

View Options

lib/puppet/application/describe.rb

View Options

lib/puppet/application/doc.rb

View Options

lib/puppet/application/filebucket.rb

View Options

lib/puppet/application/inspect.rb

View Options

lib/puppet/application/kick.rb

View Options

lib/puppet/application/master.rb

View Options

lib/puppet/application/queue.rb

View Options

lib/puppet/application/resource.rb

View Options

lib/puppet/configurer/downloader.rb

View Options

lib/puppet/configurer/plugin_handler.rb

View Options

lib/puppet/daemon.rb

View Options

lib/puppet/defaults.rb

View Options

lib/puppet/external/nagios.rb

View Options

lib/puppet/external/nagios/base.rb

View Options

lib/puppet/file_bucket/dipper.rb

View Options

lib/puppet/indirector/facts/inventory_active_record.rb

View Options

lib/puppet/indirector/facts/yaml.rb

View Options

lib/puppet/indirector/file_bucket_file/file.rb

View Options

lib/puppet/module.rb

View Options

lib/puppet/network/http/api/v1.rb

View Options

lib/puppet/network/http/compression.rb

View Options

lib/puppet/network/http/rack/rest.rb

View Options

lib/puppet/network/rest_authconfig.rb

View Options

lib/puppet/network/rights.rb

View Options

lib/puppet/node/facts.rb

View Options

lib/puppet/parser/ast/collection.rb

View Options

lib/puppet/parser/ast/leaf.rb

View Options

lib/puppet/parser/functions/regsubst.rb

View Options

lib/puppet/parser/functions/split.rb

View Options

lib/puppet/parser/grammar.ra

View Options

lib/puppet/parser/lexer.rb

View Options

lib/puppet/parser/parser.rb

View Options

lib/puppet/provider/computer/computer.rb

View Options

lib/puppet/provider/mount.rb

View Options

lib/puppet/provider/mount/parsed.rb

View Options

lib/puppet/provider/parsedfile.rb

View Options

lib/puppet/provider/service/daemontools.rb

View Options

lib/puppet/provider/service/gentoo.rb

View Options

lib/puppet/provider/service/launchd.rb

View Options

lib/puppet/provider/service/runit.rb

View Options

lib/puppet/provider/user/useradd.rb

View Options

lib/puppet/provider/zpool/solaris.rb

View Options

lib/puppet/rails/database/004_add_inventory_service_tables.rb

View Options

lib/puppet/rails/database/schema.rb

View Options

lib/puppet/rails/fact_name.rb

View Options

lib/puppet/rails/fact_value.rb

View Options

lib/puppet/rails/inventory_fact.rb

View Options

lib/puppet/rails/inventory_node.rb

View Options

lib/puppet/reference/configuration.rb

View Options

lib/puppet/reference/metaparameter.rb

View Options

lib/puppet/reports/store.rb

View Options

lib/puppet/resource.rb

View Options

lib/puppet/simple_graph.rb

View Options

lib/puppet/type.rb

View Options

lib/puppet/type/augeas.rb

View Options

lib/puppet/type/computer.rb

View Options

lib/puppet/type/exec.rb

View Options

lib/puppet/type/file.rb

View Options

lib/puppet/type/file/content.rb

View Options

lib/puppet/type/file/ensure.rb

View Options

lib/puppet/type/file/selcontext.rb

View Options

lib/puppet/type/file/source.rb

View Options

lib/puppet/type/file/target.rb

View Options

lib/puppet/type/k5login.rb

View Options

lib/puppet/type/macauthorization.rb

View Options

lib/puppet/type/mcx.rb

View Options

lib/puppet/type/mount.rb

View Options

lib/puppet/type/package.rb

View Options

lib/puppet/type/schedule.rb

View Options

lib/puppet/type/selmodule.rb

View Options

lib/puppet/type/ssh_authorized_key.rb

View Options

lib/puppet/type/user.rb

View Options

lib/puppet/type/zfs.rb

View Options

lib/puppet/type/zone.rb

View Options

lib/puppet/type/zpool.rb

View Options

lib/puppet/util.rb

View Options

lib/puppet/util/command_line

View Options

lib/puppet/util/command_line.rb

View Options

lib/puppet/util/command_line/filebucket

View Options

lib/puppet/util/command_line/pi

View Options

lib/puppet/util/command_line/puppet

View Options

lib/puppet/util/command_line/puppetca

View Options

lib/puppet/util/command_line/puppetd

View Options

lib/puppet/util/command_line/puppetdoc

View Options

lib/puppet/util/command_line/puppetmasterd

View Options

lib/puppet/util/command_line/puppetqd

View Options

lib/puppet/util/command_line/puppetrun

View Options

lib/puppet/util/command_line/ralsh

View Options

lib/puppet/util/execution.rb

View Options

lib/puppet/util/execution_stub.rb

View Options

lib/puppet/util/log.rb

View Options

lib/puppet/util/log/destinations.rb

View Options

lib/puppet/util/monkey_patches.rb

View Options

lib/puppet/util/rdoc.rb

View Options

lib/puppet/util/rdoc/code_objects.rb

View Options

lib/puppet/util/rdoc/generators/puppet_generator.rb

View Options

lib/puppet/util/rdoc/parser.rb

View Options

lib/puppet/util/settings.rb

View Options

lib/puppet/util/zaml.rb

View Options

man/man5/puppet.conf.5

View Options

man/man8/filebucket.8

View Options

man/man8/puppet-agent.8

View Options

man/man8/puppet-apply.8

View Options

man/man8/puppet-cert.8

View Options

man/man8/puppet-describe.8

View Options

man/man8/puppet-doc.8

View Options

man/man8/puppet-filebucket.8

View Options

man/man8/puppet-inspect.8

View Options

man/man8/puppet-kick.8

View Options

man/man8/puppet-master.8

View Options

man/man8/puppet-queue.8

View Options

man/man8/puppet-resource.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/fixtures/integration/provider/mailalias/aliases/test1

View Options

spec/fixtures/unit/parser/lexer/aliastest.pp

View Options

spec/fixtures/unit/parser/lexer/append.pp

View Options

spec/fixtures/unit/parser/lexer/argumentdefaults.pp

View Options

spec/fixtures/unit/parser/lexer/arithmetic_expression.pp

View Options

spec/fixtures/unit/parser/lexer/arraytrailingcomma.pp

View Options

spec/fixtures/unit/parser/lexer/casestatement.pp

View Options

spec/fixtures/unit/parser/lexer/classheirarchy.pp

View Options

spec/fixtures/unit/parser/lexer/classincludes.pp

View Options

spec/fixtures/unit/parser/lexer/classpathtest.pp

View Options

spec/fixtures/unit/parser/lexer/collection.pp

View Options

spec/fixtures/unit/parser/lexer/collection_override.pp

View Options

spec/fixtures/unit/parser/lexer/collection_within_virtual_definitions.pp

View Options

spec/fixtures/unit/parser/lexer/componentmetaparams.pp

View Options

spec/fixtures/unit/parser/lexer/componentrequire.pp

View Options

spec/fixtures/unit/parser/lexer/deepclassheirarchy.pp

View Options

spec/fixtures/unit/parser/lexer/defineoverrides.pp

View Options

spec/fixtures/unit/parser/lexer/emptyclass.pp

View Options

spec/fixtures/unit/parser/lexer/emptyexec.pp

View Options

spec/fixtures/unit/parser/lexer/emptyifelse.pp

View Options

spec/fixtures/unit/parser/lexer/falsevalues.pp

View Options

spec/fixtures/unit/parser/lexer/filecreate.pp

View Options

spec/fixtures/unit/parser/lexer/fqdefinition.pp

View Options

spec/fixtures/unit/parser/lexer/fqparents.pp

View Options

spec/fixtures/unit/parser/lexer/funccomma.pp

View Options

spec/fixtures/unit/parser/lexer/hash.pp

View Options

spec/fixtures/unit/parser/lexer/ifexpression.pp

View Options

spec/fixtures/unit/parser/lexer/implicititeration.pp

View Options

spec/fixtures/unit/parser/lexer/multilinecomments.pp

View Options

spec/fixtures/unit/parser/lexer/multipleclass.pp

View Options

spec/fixtures/unit/parser/lexer/multipleinstances.pp

View Options

spec/fixtures/unit/parser/lexer/multisubs.pp

View Options

spec/fixtures/unit/parser/lexer/namevartest.pp

View Options

spec/fixtures/unit/parser/lexer/scopetest.pp

View Options

spec/fixtures/unit/parser/lexer/selectorvalues.pp

View Options

spec/fixtures/unit/parser/lexer/simpledefaults.pp

View Options

spec/fixtures/unit/parser/lexer/simpleselector.pp

View Options

spec/fixtures/unit/parser/lexer/singleary.pp

View Options

spec/fixtures/unit/parser/lexer/singlequote.pp

View Options

spec/fixtures/unit/parser/lexer/singleselector.pp

View Options

spec/fixtures/unit/parser/lexer/subclass_name_duplication.pp

View Options

spec/fixtures/unit/parser/lexer/tag.pp

View Options

spec/fixtures/unit/parser/lexer/tagged.pp

View Options

spec/fixtures/unit/parser/lexer/virtualresources.pp

View Options

spec/fixtures/unit/provider/host/parsed/valid_hosts

View Options

spec/fixtures/unit/provider/mount/mount-output.aix.txt

View Options

spec/fixtures/unit/provider/mount/parsed/aix.filesystems

View Options

spec/fixtures/unit/provider/mount/parsed/aix.mount

View Options

spec/fixtures/unit/provider/mount/parsed/darwin.mount

View Options

spec/fixtures/unit/provider/mount/parsed/freebsd.fstab

View Options

spec/fixtures/unit/provider/mount/parsed/freebsd.mount

View Options

spec/fixtures/unit/provider/mount/parsed/hpux.mount

View Options

spec/fixtures/unit/provider/mount/parsed/linux.fstab

View Options

spec/fixtures/unit/provider/mount/parsed/linux.mount

View Options

spec/fixtures/unit/provider/mount/parsed/netbsd.fstab

View Options

spec/fixtures/unit/provider/mount/parsed/netbsd.mount

View Options

spec/fixtures/unit/provider/mount/parsed/openbsd.fstab

View Options

spec/fixtures/unit/provider/mount/parsed/openbsd.mount

View Options

spec/fixtures/unit/provider/mount/parsed/solaris.fstab

View Options

spec/fixtures/unit/provider/mount/parsed/solaris.mount

View Options

spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys

View Options

spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys1

View Options

spec/fixtures/unit/provider/ssh_authorized_key/parsed/authorized_keys2

View Options

spec/fixtures/unit/reports/tagmail/tagmail_failers.conf

View Options

spec/fixtures/unit/reports/tagmail/tagmail_passers.conf

View Options

spec/fixtures/unit/util/rdoc/basic.pp

View Options

spec/integration/configurer_spec.rb

View Options

spec/integration/parser/parser_spec.rb

View Options

spec/integration/provider/mailalias/aliases_spec.rb

View Options

spec/integration/provider/mount_spec.rb

View Options

spec/integration/type/file_spec.rb

View Options

spec/lib/puppet_spec/files.rb

View Options

spec/lib/puppet_spec/fixtures.rb

View Options

spec/shared_behaviours/all_parsedfile_providers.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/application/agent_spec.rb

View Options

spec/unit/application/apply_spec.rb

View Options

spec/unit/application/cert_spec.rb

View Options

spec/unit/application/filebucket_spec.rb

View Options

spec/unit/application/inspect_spec.rb

View Options

spec/unit/application/queue_spec.rb

View Options

spec/unit/application_spec.rb

View Options

spec/unit/configurer/downloader_spec.rb

View Options

spec/unit/daemon_spec.rb

View Options

spec/unit/file_bucket/dipper_spec.rb

View Options

spec/unit/file_bucket/file_spec.rb

View Options

spec/unit/indirector/facts/inventory_active_record_spec.rb

View Options

spec/unit/indirector/facts/yaml_spec.rb

View Options

spec/unit/indirector/file_bucket_file/file_spec.rb

View Options

spec/unit/indirector/queue_spec.rb

View Options

spec/unit/module_spec.rb

View Options

spec/unit/network/handler/fileserver_spec.rb

View Options

spec/unit/network/http/api/v1_spec.rb

View Options

spec/unit/network/http/compression_spec.rb

View Options

spec/unit/parser/ast/collection_spec.rb

View Options

spec/unit/parser/functions/defined_spec.rb

View Options

spec/unit/parser/functions/extlookup_spec.rb

View Options

spec/unit/parser/functions/fqdn_rand_spec.rb

View Options

spec/unit/parser/functions/generate_spec.rb

View Options

spec/unit/parser/functions/include_spec.rb

View Options

spec/unit/parser/functions/inline_template_spec.rb

View Options

spec/unit/parser/functions/realize_spec.rb

View Options

spec/unit/parser/functions/regsubst_spec.rb

View Options

spec/unit/parser/functions/require_spec.rb

View Options

spec/unit/parser/functions/shellquote_spec.rb

View Options

spec/unit/parser/functions/split_spec.rb

View Options

spec/unit/parser/functions/sprintf_spec.rb

View Options

spec/unit/parser/functions/tag_spec.rb

View Options

spec/unit/parser/functions/template_spec.rb

View Options

spec/unit/parser/functions/versioncmp_spec.rb

View Options

spec/unit/parser/lexer_spec.rb

View Options

spec/unit/parser/parser_spec.rb

View Options

spec/unit/provider/host/parsed_spec.rb

View Options

spec/unit/provider/mount/parsed_spec.rb

View Options

spec/unit/provider/mount_spec.rb

View Options

spec/unit/provider/ssh_authorized_key/parsed_spec.rb

View Options

spec/unit/provider/user/user_role_add_spec.rb

View Options

spec/unit/provider/user/useradd_spec.rb

View Options

spec/unit/provider/zpool/solaris_spec.rb

View Options

spec/unit/reports/store_spec.rb

View Options

spec/unit/reports/tagmail_spec.rb

View Options

spec/unit/resource_spec.rb

View Options

spec/unit/simple_graph_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/type/file/selinux_spec.rb

View Options

spec/unit/type/file_spec.rb

View Options

spec/unit/type/mount_spec.rb

View Options

spec/unit/type/user_spec.rb

View Options

spec/unit/type/zone_spec.rb

View Options

spec/unit/type_spec.rb

View Options

spec/unit/util/command_line_spec.rb

View Options

spec/unit/util/execution_spec.rb

View Options

spec/unit/util/execution_stub_spec.rb

View Options

spec/unit/util/log/destinations_spec.rb

View Options

spec/unit/util/log_spec.rb

View Options

spec/unit/util/rdoc/parser_spec.rb

View Options

spec/unit/util/rdoc_spec.rb

View Options

spec/unit/util/settings_spec.rb

View Options

tasks/rake/git_workflow.rake

View Options

tasks/rake/manpages.rake

View Options

test/data/providers/mount/parsed/aix.mount

View Options

test/data/providers/mount/parsed/darwin.mount

View Options

test/data/providers/mount/parsed/hpux.mount

View Options

test/data/providers/mount/parsed/linux.mount

View Options

test/data/providers/mount/parsed/solaris.mount

View Options

test/data/types/mount/linux.fstab

View Options

test/data/types/mount/solaris.fstab

View Options

test/ral/type/exec.rb