diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:20:27 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-07-27 10:20:45 -0700 |
| commit | d5db8db116aff58215ab0feebd7ec02086040f51 (patch) | |
| tree | 58489a37bd0ee14b3d053a0e23f9638b4f6205e7 /conf/suse/ruby-env.patch | |
| parent | 865282ae7b9332fdbdfa51b2814755b8a13d244b (diff) | |
| parent | b53e7d78e2e87571ae53170e9716b9ccd75da6e2 (diff) | |
| download | puppet-d5db8db116aff58215ab0feebd7ec02086040f51.tar.gz puppet-d5db8db116aff58215ab0feebd7ec02086040f51.tar.xz puppet-d5db8db116aff58215ab0feebd7ec02086040f51.zip | |
Merge branch 'next'
This synchronizes the 2.7 master branch with 2.6.1RC1
Diffstat (limited to 'conf/suse/ruby-env.patch')
| -rw-r--r-- | conf/suse/ruby-env.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/conf/suse/ruby-env.patch b/conf/suse/ruby-env.patch new file mode 100644 index 000000000..0a7a8a748 --- /dev/null +++ b/conf/suse/ruby-env.patch @@ -0,0 +1,17 @@ +--- sbin/puppetd 2010-07-18 14:17:38.000000000 -0700 ++++ sbin/puppetd 2010-07-21 17:31:57.057138615 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env ruby ++#!/usr/bin/ruby + + require 'puppet/application/agent' + Puppet::Application[:agent].run + +--- sbin/puppetmasterd 2010-07-18 14:17:38.000000000 -0700 ++++ sbin/puppetmasterd 2010-07-21 17:32:10.178513969 -0700 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env ruby ++#!/usr/bin/ruby + + require 'puppet/application/master' + Puppet::Application[:master].run |