aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-06 13:03:41 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-06 13:03:41 -0800
commit9423c2a7d88207e7c786a13ad1713ee9dd0044a3 (patch)
treee1feba1b29f7b6b01faf6c67ab77f446ea143975 /activesupport/lib/active_support
parent3caca406c8cadbd4a42e50bfbb3e2794fd8d985e (diff)
parentbd5cb0562e93a1a0e225ee2bc9042c0e5bdb39dd (diff)
downloadrails-9423c2a7d88207e7c786a13ad1713ee9dd0044a3.tar.gz
rails-9423c2a7d88207e7c786a13ad1713ee9dd0044a3.tar.bz2
rails-9423c2a7d88207e7c786a13ad1713ee9dd0044a3.zip
Merge remote branch 'fxn/master'
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/core_ext/kernel.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/kernel/daemonizing.rb7
2 files changed, 0 insertions, 8 deletions
diff --git a/activesupport/lib/active_support/core_ext/kernel.rb b/activesupport/lib/active_support/core_ext/kernel.rb
index 1922d804bf..c3bed14f63 100644
--- a/activesupport/lib/active_support/core_ext/kernel.rb
+++ b/activesupport/lib/active_support/core_ext/kernel.rb
@@ -1,4 +1,3 @@
-require 'active_support/core_ext/kernel/daemonizing'
require 'active_support/core_ext/kernel/reporting'
require 'active_support/core_ext/kernel/agnostics'
require 'active_support/core_ext/kernel/requires'
diff --git a/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb b/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb
deleted file mode 100644
index ed9d1f9bf2..0000000000
--- a/activesupport/lib/active_support/core_ext/kernel/daemonizing.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Kernel
- # Turns the current script into a daemon process that detaches from the console.
- # It can be shut down with a TERM signal.
- def daemonize
- Process.daemon
- end
-end