Merge branch 'master' into master_no_global_resources

Conflicts:

	lib/puppet/node/catalog.rb
	lib/puppet/type/pfile.rb
	lib/puppet/type/pfilebucket.rb
	lib/puppet/util/filetype.rb
	spec/unit/node/catalog.rb
	spec/unit/other/transbucket.rb
	spec/unit/ral/provider/mount/parsed.rb
	spec/unit/ral/types/file.rb
	spec/unit/ral/types/interface.rb
	spec/unit/ral/types/mount.rb
	spec/unit/ral/types/package.rb
	spec/unit/ral/types/schedule.rb
	spec/unit/ral/types/service.rb
	test/language/compile.rb
	test/language/lexer.rb
	test/language/snippets.rb
	test/lib/puppettest.rb
	test/ral/types/basic.rb
	test/ral/types/cron.rb
	test/ral/types/exec.rb
	test/ral/types/file.rb
	test/ral/types/file/target.rb
	test/ral/types/filebucket.rb
	test/ral/types/fileignoresource.rb
	test/ral/types/filesources.rb
	test/ral/types/group.rb
	test/ral/types/host.rb
	test/ral/types/parameter.rb
	test/ral/types/sshkey.rb
	test/ral/types/tidy.rb
	test/ral/types/user.rb
	test/ral/types/yumrepo.rb

1 files changed, 11 insertions, 2 deletions

diff --git a/debian/puppet.init b/debian/puppet.init
index da9f548cb..063f9273f 100644
--- a/debian/puppet.init
+++ b/debian/puppet.init
@@ -12,6 +12,10 @@ test -x $DAEMON || exit 0
 
 . /lib/lsb/init-functions
 
+reload_puppet() {
+	start-stop-daemon --stop --quiet --signal HUP --pidfile /var/run/puppet/$NAME.pid
+}
+
 start_puppet() {
 	start-stop-daemon --start --quiet --pidfile /var/run/puppet/$NAME.pid \
 		--startas $DAEMON -- $DAEMON_OPTS
@@ -39,7 +43,12 @@ case "$1" in
 	stop_puppet
 	log_end_msg 0
 	;;
-  restart|force-reload)
+    reload)
+    	log_begin_msg "Reloading $DESC"
+    	reload_puppet
+    	log_end_msg 0
+    	;;
+    restart|force-reload)
 	log_begin_msg "Restarting $DESC"
 	stop_puppet
 	sleep 1
@@ -47,7 +56,7 @@ case "$1" in
 	log_end_msg 0
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart|force-reload}" >&2
+	echo "Usage: $0 {start|stop|restart|force-reload|reload}" >&2
 	exit 1
 	;;
 esac