Diffusion puppet 4196699f5fbb

Merge branch 'next'
4196699f5fbbUnpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'next'

next: (34 commits) (#6820) Fix File class lookup in the file type for Ruby 1.9 (#6820) Fix nagios parser to use proper hash syntax for Ruby 1.9 (#6820) Fix Invalid multibyte character (#6820) Fix RDOC parser to work with Ruby 1.9 (#6820) Fix invalid next that should be a return (#2782) Fix constant_defined? (#6527) Fix pip tests (#6527) Fix uninstall problem and refactor (#6527) Added pip package provider. maint: Change code for finding spec_helper to work with Ruby 1.9 Fix error "invalid multibyte char (US-ASCII)" under Ruby 1.9 Fixed #6562 - Minor kick documentation fix (#6566) Replace tabs with spaces (#6566) Fix ruby 1.9 incompatible case statement Fixed #6566 Replace ftools with filetuils in rake gem task (#6555) Fix another ruby 1.9 incompatible case statement Fixed #6555 - Fixed two more when then colon issues Fixed #6555 - Ruby 1.9.x returning Invalid next (SyntaxError) Fixed #6555 - Ruby 1.9.x warning: class variable access from toplevel (#6658) Propagate ENC connection errors to the agent ...

Details

Provenance

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

Parents

rPU66d0b16c8a0a: Merge branch '2.6.next' into next
rPU7e71840e29cb: Merge branch 'next'

Branches

Unknown

Tags

Unknown

References

tag: Iteration-2011-03-23-master

Event Timeline

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

Merged Changes

66d0b16c8a0a Merge branch '2.6.next' into next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
36f4dc5e1527 Merge branch 'ticket/next/6820_ruby19_fixes' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
36a5665f3e0a (#6820) Fix File class lookup in the file type for Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
8c32db76f681 (#6820) Fix nagios parser to use proper hash syntax for Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
054eac6a6611 (#6820) Fix Invalid multibyte character
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7a4fcf2835ac (#6820) Fix RDOC parser to work with Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
341654ea16e6 (#6820) Fix invalid next that should be a return
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
3d43d866d662 (#2782) Fix constant_defined?
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ad85b67ade99 Merge branch 'feature/next/6527-pip_package_provider' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
61803976a835 (#6527) Fix pip tests
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
854216047953 Merge branch 'feature/next/6257-pip_package_provider' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
0170cebba039 (#6527) Fix uninstall problem and refactor
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
af42367dce6a (#6527) Added pip package provider.
Author
Richard Crowley <r@rcrowley.org>
Browse Repository
No Builds
No Audits
6bf5b7fea8ef Merge branch 'ticket/next/maint-fix_require_spec_helper_for_ruby_19' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
f6da3339f59b maint: Change code for finding spec_helper to work with Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
307df20d7dfd Fix error "invalid multibyte char (US-ASCII)" under Ruby 1.9
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
3875b5ba9014 Merge branch 'tickets/2.6.x/6562' into 2.6.next
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
a29c7fd408b8 Fixed #6562 - Minor kick documentation fix
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
e80063468e40 Merge branch 'ticket/next/6566' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
4156edc25b3a (#6566) Replace tabs with spaces
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d448763f6e94 (#6566) Fix ruby 1.9 incompatible case statement
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
517fd2f3d354 Fixed #6566 Replace ftools with filetuils in rake gem task
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
dfb2c0ff8c07 Merge branch 'ticket/next/6555' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
ad8cc54d8022 (#6555) Fix another ruby 1.9 incompatible case statement
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
0844a17f695b Fixed #6555 - Fixed two more when then colon issues
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
923d613bb5d9 Fixed #6555 - Ruby 1.9.x returning Invalid next (SyntaxError)
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
66a4f3615028 Fixed #6555 - Ruby 1.9.x warning: class variable access from toplevel
Author
James Turnbull <james@lovedthanlost.net>
Browse Repository
No Builds
No Audits
696ba50accc6 Merge branch 'ticket/2.6.next/6658' into 2.6.next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
df2051312235 (#6658) Propagate ENC connection errors to the agent
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fa2010b13835 Merge branch 'ticket/2.6.x/5814' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
335ce03ecc1f Merge branch 'ticket/next/maint-silence_false_test_output' into next
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
cf873c63f8aa maint: Silence test output in the spec run
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
137f1eacb2cd Merge branch 'ticket/2.6.next/maint-more-exec-testing' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
08115c074202 (#4884) Remove typo from spec test
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
a1d32fb0e29d Merge branch 'ticket/2.6.next/maint-fix-exec-tests' into 2.6.next
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
f2c771be3997 (#4884) Modify tests to pass on non-OS X systems
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
462a56060f0f Merge branch 'feature/2.6.next/4884-an-exec-provider-that-executes-unfiltered…
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
ec1aa192825f (#4884) Revise new exec tests, add a few more
Author
Max Martin <max@puppetlabs.com>
Browse Repository
No Builds
No Audits
0d2d6f3f005e (#4884) Add an shell provider for execs
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
d2e911a1f9da (#4884) Fix Test::Unit exec tests
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fa0cfc60ccf4 (#4884) Break the exec type out to have a posix provider
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
c86a980fe9b2 (#4884) Add consistent path validation and behavior
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
77fbf7fdd3d1 (#4884) Add expand_path to requiring the spec_helper
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
7ec90576d396 (#4884) Autorequire shared behaviors and method to silence warnings
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
acc99ba8f87c (#4884) Fix whitespace
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
6a4d291fa72a (#4884) Get rid of open3 require since it wasn't being used
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
fddc16535b16 (#5814) Improved cron type specs
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits
f2dfee6e2f87 (#5814) cron_spec shouldn't depend on cron provider
Author
Stefan Schulte <stefan.schulte@taunusstein.net>
Browse Repository
No Builds
No Audits

Changes (97)

Path

Size

lib/

puppet/

application/

external/

nagios/

indirector/

parameter/

parser/

provider/

package/

service/

type/

macauthorization.rb

util/

log/

destinations.rb

rdoc/

spec/

integration/

indirector/

catalog/

compiler_spec.rb

provider/

package_spec.rb

service/

reference/

providers_spec.rb

transaction_spec.rb

util/

autoload_spec.rb

feature_spec.rb

file_locking_spec.rb

rdoc/

lib/

puppet_spec/

shared_behaviours/

path_parameters.rb

unit/

application/

indirector/

file_bucket_file/

resource/

status/

network/

authstore_spec.rb

http/

api/

xmlrpc/

parameter/

property/

keyvalue_spec.rb

ordered_list_spec.rb

provider/

package/

selboolean_spec.rb

selmodule_spec.rb

reports/

rrdgraph_spec.rb

tagmail_spec.rb

type/

file/

checksum_spec.rb

content_spec.rb

selinux_spec.rb

maillist_spec.rb

selboolean_spec.rb

selmodule_spec.rb

util/

autoload_spec.rb

command_line_spec.rb

feature_spec.rb

file_locking_spec.rb

filetype_spec.rb

inline_docs_spec.rb

logging_spec.rb

monkey_patches_spec.rb

rdoc/

user_attr_spec.rb

tasks/

rake/

git_workflow.rake

test/

ral/

type/

rPU4196699f5fbb

lib/puppet/application/kick.rb

Loading...

lib/puppet/external/nagios/parser.rb

Loading...

lib/puppet/indirector/exec.rb

Loading...

lib/puppet/parameter.rb

Loading...

lib/puppet/parameter/path.rb

Loading...

lib/puppet/parser/lexer.rb

Loading...

lib/puppet/provider/exec/posix.rb

Loading...

lib/puppet/provider/exec/shell.rb

Loading...

lib/puppet/provider/package/pip.rb

Loading...

lib/puppet/provider/service/daemontools.rb

Loading...

lib/puppet/provider/service/launchd.rb

Loading...

lib/puppet/rails.rb

Loading...

lib/puppet/type/exec.rb

Loading...

lib/puppet/type/file.rb

Loading...

lib/puppet/type/macauthorization.rb

Loading...

lib/puppet/util/classgen.rb

Loading...

lib/puppet/util/log/destinations.rb

Loading...

lib/puppet/util/rdoc/parser.rb

Loading...

spec/integration/indirector/catalog/compiler_spec.rb

Loading...

spec/integration/indirector/catalog/queue_spec.rb

Loading...

spec/integration/provider/package_spec.rb

Loading...

spec/integration/provider/service/init_spec.rb

Loading...

spec/integration/reference/providers_spec.rb

Loading...

spec/integration/transaction_spec.rb

Loading...

spec/integration/util/autoload_spec.rb

Loading...

spec/integration/util/feature_spec.rb

Loading...

spec/integration/util/file_locking_spec.rb

Loading...

spec/integration/util/rdoc/parser_spec.rb

Loading...

spec/lib/puppet_spec/verbose.rb

Loading...

spec/shared_behaviours/path_parameters.rb

Loading...

spec/spec_helper.rb

Loading...

spec/unit/application/agent_spec.rb

Loading...

spec/unit/indirector/exec_spec.rb

Loading...

spec/unit/indirector/file_bucket_file/rest_spec.rb

Loading...

spec/unit/indirector/resource/rest_spec.rb

Loading...

spec/unit/indirector/status/rest_spec.rb

Loading...

spec/unit/network/authstore_spec.rb

Loading...

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

Loading...

spec/unit/network/xmlrpc/client_spec.rb

Loading...

spec/unit/parameter/path_spec.rb

Loading...

spec/unit/property/ensure_spec.rb

Loading...

spec/unit/property/keyvalue_spec.rb

Loading...

spec/unit/property/list_spec.rb

Loading...

spec/unit/property/ordered_list_spec.rb

Loading...

spec/unit/provider/exec/posix_spec.rb

Loading...

spec/unit/provider/exec/shell_spec.rb

Loading...

spec/unit/provider/package/apt_spec.rb

Loading...

spec/unit/provider/package/dpkg_spec.rb

Loading...

spec/unit/provider/package/pip_spec.rb

Loading...

spec/unit/provider/package/pkg_spec.rb

Loading...

spec/unit/provider/package/pkgdmg_spec.rb

Loading...

spec/unit/provider/selboolean_spec.rb

Loading...

spec/unit/provider/selmodule_spec.rb

Loading...

spec/unit/reports/http_spec.rb

Loading...

spec/unit/reports/rrdgraph_spec.rb

Loading...

spec/unit/reports/store_spec.rb

Loading...

spec/unit/reports/tagmail_spec.rb

Loading...

spec/unit/type/cron_spec.rb

Loading...

spec/unit/type/exec_spec.rb

Loading...

spec/unit/type/file/checksum_spec.rb

Loading...

spec/unit/type/file/content_spec.rb

Loading...

spec/unit/type/file/ctime.rb

Loading...

spec/unit/type/file/ensure_spec.rb

Loading...

spec/unit/type/file/group_spec.rb

Loading...

spec/unit/type/file/mtime.rb

Loading...

spec/unit/type/file/owner_spec.rb

Loading...

spec/unit/type/file/selinux_spec.rb

Loading...

spec/unit/type/file/source_spec.rb

Loading...

spec/unit/type/file/type.rb

Loading...

spec/unit/type/maillist_spec.rb

Loading...

spec/unit/type/selboolean_spec.rb

Loading...

spec/unit/type/selmodule_spec.rb

Loading...

spec/unit/type/zfs_spec.rb

Loading...

spec/unit/type/zone_spec.rb

Loading...

spec/unit/type/zpool_spec.rb

Loading...

spec/unit/util/autoload_spec.rb

Loading...

spec/unit/util/command_line_spec.rb

Loading...

spec/unit/util/errors_spec.rb

Loading...

spec/unit/util/feature_spec.rb

Loading...

spec/unit/util/file_locking_spec.rb

Loading...

spec/unit/util/filetype_spec.rb

Loading...

spec/unit/util/inline_docs_spec.rb

Loading...

spec/unit/util/log_spec.rb

Loading...

spec/unit/util/logging_spec.rb

Loading...

spec/unit/util/metric_spec.rb

Loading...

spec/unit/util/monkey_patches_spec.rb

Loading...

spec/unit/util/posix_spec.rb

Loading...

spec/unit/util/pson_spec.rb

Loading...

spec/unit/util/rdoc/parser_spec.rb

Loading...

spec/unit/util/rdoc_spec.rb

Loading...

spec/unit/util/user_attr_spec.rb

Loading...

spec/unit/util/zaml_spec.rb

Loading...

tasks/rake/gem.rake

Loading...

tasks/rake/git_workflow.rake

Loading...

test/ral/type/exec.rb

Loading...