diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-23 14:32:59 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-23 14:32:59 -0700 |
| commit | 66d0b16c8a0a55dd79b1b0f0e639f107e552d9ab (patch) | |
| tree | adb06f307051368e9fe9a23c3338fe7511eb8adf /lib/puppet/util/rdoc/code_objects.rb | |
| parent | 36f4dc5e1527fc46f097080c12bb1ee5c3d46714 (diff) | |
| parent | 3875b5ba9014a6ba540e51e0ffb411d58aa521e4 (diff) | |
| download | puppet-66d0b16c8a0a55dd79b1b0f0e639f107e552d9ab.tar.gz puppet-66d0b16c8a0a55dd79b1b0f0e639f107e552d9ab.tar.xz puppet-66d0b16c8a0a55dd79b1b0f0e639f107e552d9ab.zip | |
Merge branch '2.6.next' into next
* 2.6.next:
Fixed #6562 - Minor kick documentation fix
(#6658) Propagate ENC connection errors to the agent
(#4884) Remove typo from spec test
(#4884) Modify tests to pass on non-OS X systems
(#4884) Revise new exec tests, add a few more
(#4884) Add an shell provider for execs
(#4884) Fix Test::Unit exec tests
(#4884) Break the exec type out to have a posix provider
(#4884) Add consistent path validation and behavior
(#4884) Add expand_path to requiring the spec_helper
(#4884) Autorequire shared behaviors and method to silence warnings
(#4884) Fix whitespace
(#4884) Get rid of open3 require since it wasn't being used
(#5814) Improved cron type specs
(#5814) cron_spec shouldn't depend on cron provider
Manually Resolved Conflicts:
lib/puppet/util/command_line/puppetrun
spec/spec_helper.rb
spec/unit/type/exec_spec.rb
spec/unit/type_spec.rb
test/ral/type/exec.rb
Diffstat (limited to 'lib/puppet/util/rdoc/code_objects.rb')
0 files changed, 0 insertions, 0 deletions