Diffusion puppet 9c06fbd762cd

Merge branch 'next'
9c06fbd762cdUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

next: (39 commits) (#5908) Add support for new update-rc.d disable API (#6830) Fix tests that depended on special inherited behavior (#6830) Fix overly stubbed tests (#6830) Fix instance_variables now comes back as symbols (#6830) Fix badly stubbed Time object in test (#6830) Fix MD5 handling to work with Ruby 1.9 (#6830) Fix File class scoping (#6830) Handle case where array is actually a string (#6830) Fix case where instance_variables returns symbols in Ruby 1.9 (#6862) Add a default subject for the mail_patches rake task Fixed #6256 - Creation of rrd directory. (#6855) ResourceType#search now accepts a regex (#5477) Allow watch_file to watch non-existent files, especially site.pp (#5477) Allow watch_file to watch non-existent files, especially site.pp Fixing #6851 - ResourceType#find/search loads types Fixing Module#path detection Fixed #6850 - Clean up ResourceType#to_pson (#6830) Fix stat method calls to not use an unneeded argument (#4576) Raise an error when a node is classified into a non-existent class Update CHANGELOG for 2.6.7 ...

Details

Provenance

Max Martin <max@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU11309a214148: Merge branch '2.6.x' into next
rPU4196699f5fbb: Merge branch 'next'

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2011-03-30-master

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU9c06fbd762cd: Merge branch 'next' (authored by Max Martin <max@puppetlabs.com>).Mar 30 2011, 10:02 PM

Merged Changes

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

11309a214148 Merge branch '2.6.x' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
9d17809e5b24 Merge branch '2.6.next' into 2.6.x
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
f5170fc2dbcb Merge branch 'ticket/2.6.next/5908-update-rc' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
f5aabf52631a (#5908) Add support for new update-rc.d disable API
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
9290b2f990fd Merge branch 'tickets/master/6494' of https://github.com/domcleal/puppet into…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
12f5a15305ce Merge branch 'tickets/master/6324' of https://github.com/domcleal/puppet into…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
b9982b600871 Merge branch 'feature/master/6144' of https://github.com/ghoneycutt/puppet into…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
4413c3e6787d Merge branch 'feature/2.6.next/5909' of https://github.com/bodepd/puppet into…
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
1a7f0dc6c4bf Merge branch 'feature/master/5432' of https://github.com/keymon/puppet into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
54f15b6eae23 Merge branch 'ticket/next/6830-ready_to_merge' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
1ac7f63f00c5 (#6830) Fix tests that depended on special inherited behavior
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
29f3dda2aaa4 (#6830) Fix overly stubbed tests
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
5e9dfdcec4a3 (#6830) Fix instance_variables now comes back as symbols
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
893817f76313 (#6830) Fix badly stubbed Time object in test
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ade4efea6d2d (#6830) Fix MD5 handling to work with Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
bfac57a0e5e1 (#6830) Fix File class scoping
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
a520c5e3f6cb (#6830) Handle case where array is actually a string
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
85f3b767e827 (#6830) Fix case where instance_variables returns symbols in Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec3178f7f3e7 Merge branch 'tickets/2.6.x/6862' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
37f9ca091353 (#6862) Add a default subject for the mail_patches rake task
Author
Brice Figureau <brice-puppet@daysofwonder.com>
Browse Repository
No Builds
No Audits
5693e4129159 Merge branch 'tickets/2.6.x/6256' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
9a4de12bc4a7 Fixed #6256 - Creation of rrd directory.
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
6985cc0f898d Merge branch 'ticket/next/5477' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
cc5396929051 Merge branch 'ticket/2.6.next/5477' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
cc43dd79ad8d Merge commit '2.6.next^1' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
a2ac367c2bea Merge branch 'ticket/2.6.next/5477' into 2.6.next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
c0236aab1145 Merge branch 'tickets/next/6855-searching_in_resource_type' into next
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
076de13a2416 (#6855) ResourceType#search now accepts a regex
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
7c60db5d9db8 (#5477) Allow watch_file to watch non-existent files, especially site.pp
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
daaa048a8d88 (#5477) Allow watch_file to watch non-existent files, especially site.pp
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
de2e84eb9341 Merge branch 'tickets/master/6850-resource_type_listing_and_converting' into…
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
e16a38349c59 Fixing #6851 - ResourceType#find/search loads types
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
29268f3fda3c Fixing Module#path detection
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
da082d500e1f Fixed #6850 - Clean up ResourceType#to_pson
Author
Luke Kanies <luke@puppetlabs.com>
Browse Repository
No Builds
No Audits
072baff5b5ce Merge branch 'ticket/next/6830_stat_calls' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
b42c57ddf618 (#6830) Fix stat method calls to not use an unneeded argument
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7f6e5ee743c Merge branch 'ticket/next/4576' into next
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
8124f8e72514 (#4576) Raise an error when a node is classified into a non-existent class
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
0fec21fcd887 Merge branch 'ticket/2.6.next/5221' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
0f3e537a127f Merge branch 'feature/2.6.next/4576' of https://github.com/bodepd/puppet into 2.
Author
Jesse Wolfe <jes5199@gmail.com>
Browse Repository
No Builds
No Audits
99201ff662e8 Merge branch '2.6.x' into 2.6.next
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
76b3ee6822f5 Update CHANGELOG for 2.6.7
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
7761acb5acd9 (#5221) Add test for fix to fileset with trailing separator
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
357514ceec94 (#5221) Fix fileset path absoluteness checking with trailing slash
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
9f1a01653f97 Merge branch 'ticket/2.6.next/4769' into 2.6.next
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
f8941b80bb8b (#4769) Fix negative timeout support for newer rubies
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
196294a73e32 (4576) - if ENC declares invalid class, it is logged at warning.
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits
49059568d0e4 (5909) Function to dyncamically generate resources.
Author
Dan Bode <bodepd@gmail.com>
Browse Repository
No Builds
No Audits
f0d768465d01 (#6494) Add setm command to Augeas provider
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits
0026e43ef99f (#6494) Add mv command to Augeas provider
Author
Dominic Cleal <dcleal@redhat.com>
Browse Repository
No Builds
No Audits

Changes (75)

Path

Size

lib/

puppet/

application/

file_serving/

indirector/

resource_type/

node/

parser/

functions/

create_resources.rb

parser_support.rb

provider/

augeas/

file/

group/

service/

user/

zfs/

resource/

simple_graph.rb

transaction/

type/

file/

util/

spec/

unit/

application/

file_serving/

fileset_spec.rb

indirector/

active_record_spec.rb

direct_file_server_spec.rb

file_server_spec.rb

resource_type/

ssl_file_spec.rb

network/

authconfig_spec.rb

rest_authconfig_spec.rb

node/

environment_spec.rb

parser/

ast/

casestatement_spec.rb

compiler_spec.rb

functions/

create_resources_spec.rb

type_loader_spec.rb

provider/

augeas/

service/

zfs/

solaris_spec.rb

resource/

type/

util/

loadedfile_spec.rb

rdoc/

tasks/

rake/

git_workflow.rake

test/

language/

rPU9c06fbd762cd

CHANGELOG

Loading...

lib/puppet/application/master.rb

Loading...

lib/puppet/defaults.rb

Loading...

lib/puppet/file_serving/fileset.rb

Loading...

lib/puppet/indirector/resource_type/parser.rb

Loading...

lib/puppet/module.rb

Loading...

lib/puppet/node/environment.rb

Loading...

lib/puppet/parser/compiler.rb

Loading...

lib/puppet/parser/functions/create_resources.rb

Loading...

lib/puppet/parser/functions/fqdn_rand.rb

Loading...

lib/puppet/parser/lexer.rb

Loading...

lib/puppet/parser/parser_support.rb

Loading...

lib/puppet/parser/type_loader.rb

Loading...

lib/puppet/provider/aixobject.rb

Loading...

lib/puppet/provider/augeas/augeas.rb

Loading...

lib/puppet/provider/file/posix.rb

Loading...

lib/puppet/provider/file/win32.rb

Loading...

lib/puppet/provider/group/aix.rb

Loading...

lib/puppet/provider/service/debian.rb

Loading...

lib/puppet/provider/service/smf.rb

Loading...

lib/puppet/provider/user/aix.rb

Loading...

lib/puppet/provider/zfs/solaris.rb

Loading...

lib/puppet/resource/type.rb

Loading...

lib/puppet/simple_graph.rb

Loading...

lib/puppet/transaction/event.rb

Loading...

lib/puppet/type/exec.rb

Loading...

lib/puppet/type/file/ctime.rb

Loading...

lib/puppet/type/file/ensure.rb

Loading...

lib/puppet/type/file/group.rb

Loading...

lib/puppet/type/file/mode.rb

Loading...

lib/puppet/type/file/mtime.rb

Loading...

lib/puppet/type/file/selcontext.rb

Loading...

lib/puppet/type/file/type.rb

Loading...

lib/puppet/type/group.rb

Loading...

lib/puppet/type/tidy.rb

Loading...

lib/puppet/type/user.rb

Loading...

lib/puppet/type/zfs.rb

Loading...

lib/puppet/type/zone.rb

Loading...

lib/puppet/type/zpool.rb

Loading...

lib/puppet/util/loadedfile.rb

Loading...

spec/unit/application/master_spec.rb

Loading...

spec/unit/file_serving/fileset_spec.rb

Loading...

spec/unit/indirector/active_record_spec.rb

Loading...

spec/unit/indirector/code_spec.rb

Loading...

spec/unit/indirector/direct_file_server_spec.rb

Loading...

spec/unit/indirector/exec_spec.rb

Loading...

spec/unit/indirector/file_server_spec.rb

Loading...

spec/unit/indirector/file_spec.rb

Loading...

spec/unit/indirector/ldap_spec.rb

Loading...

spec/unit/indirector/memory_spec.rb

Loading...

spec/unit/indirector/plain_spec.rb

Loading...

spec/unit/indirector/queue_spec.rb

Loading...

spec/unit/indirector/resource_type/parser_spec.rb

Loading...

spec/unit/indirector/rest_spec.rb

Loading...

spec/unit/indirector/ssl_file_spec.rb

Loading...

spec/unit/indirector/yaml_spec.rb

Loading...

spec/unit/module_spec.rb

Loading...

spec/unit/network/authconfig_spec.rb

Loading...

spec/unit/network/rest_authconfig_spec.rb

Loading...

spec/unit/node/environment_spec.rb

Loading...

spec/unit/parser/ast/casestatement_spec.rb

Loading...

spec/unit/parser/compiler_spec.rb

Loading...

spec/unit/parser/functions/create_resources_spec.rb

Loading...

spec/unit/parser/lexer_spec.rb

Loading...

spec/unit/parser/type_loader_spec.rb

Loading...

spec/unit/provider/augeas/augeas_spec.rb

Loading...

spec/unit/provider/service/debian_spec.rb

Loading...

spec/unit/provider/service/smf_spec.rb

Loading...

spec/unit/provider/zfs/solaris_spec.rb

Loading...

spec/unit/resource/type_spec.rb

Loading...

spec/unit/type/exec_spec.rb

Loading...

spec/unit/util/loadedfile_spec.rb

Loading...

spec/unit/util/rdoc/parser_spec.rb

Loading...

tasks/rake/git_workflow.rake

Loading...

test/language/functions.rb

Loading...