summaryrefslogtreecommitdiffstats
path: root/lib/puppet.rb
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-13 07:49:48 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-11-13 07:49:48 +0000
commit35de0e3bd74e94de92ac0e9209a4884cf07c88a0 (patch)
treebe7119181bc15dad6575cc5b7087c92cfd7fbac8 /lib/puppet.rb
parent26b32b953d8e097785b38aa90e5e4bff6ae9247e (diff)
downloadpuppet-35de0e3bd74e94de92ac0e9209a4884cf07c88a0.tar.gz
puppet-35de0e3bd74e94de92ac0e9209a4884cf07c88a0.tar.xz
puppet-35de0e3bd74e94de92ac0e9209a4884cf07c88a0.zip
Temporarily reverting all of the recent rails work so that I can release 0.20.1
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1873 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet.rb')
-rw-r--r--lib/puppet.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/puppet.rb b/lib/puppet.rb
index d621edb93..a6e8aef1a 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -391,8 +391,5 @@ end
require 'puppet/server'
require 'puppet/type'
require 'puppet/storage'
-if Puppet[:storeconfigs]
- require 'puppet/rails'
-end
# $Id$