summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPieter van de Bruggen <pieter@puppetlabs.com>2011-07-28 15:36:02 -0700
committerPieter van de Bruggen <pieter@puppetlabs.com>2011-07-28 15:36:02 -0700
commit11e026f53966d4525afef388a2409796bc0d807f (patch)
treee3554eaeb8b88f0e0ca5a9f288f71de3b7f1683c /lib
parent023d9597b9895f57fda05dc79adad41684179eb2 (diff)
parent38801ddbd3036b45d35e48e444d1e7d566b5db47 (diff)
downloadpuppet-11e026f53966d4525afef388a2409796bc0d807f.tar.gz
puppet-11e026f53966d4525afef388a2409796bc0d807f.tar.xz
puppet-11e026f53966d4525afef388a2409796bc0d807f.zip
Merge branch 'tickets/2.7.x/1886' into 2.7.x
* tickets/2.7.x/1886: (Maint.) Disable cleaning of storeconfigs.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/face/node/clean.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/puppet/face/node/clean.rb b/lib/puppet/face/node/clean.rb
index a4df1bfaf..d2852de04 100644
--- a/lib/puppet/face/node/clean.rb
+++ b/lib/puppet/face/node/clean.rb
@@ -54,7 +54,10 @@ Puppet::Face.define(:node, '0.0.1') do
clean_cached_facts(node)
clean_cached_node(node)
clean_reports(node)
- clean_storeconfigs(node, unexport)
+
+ # This is roughly functional, but seems to introduce order-dependent test
+ # failures; this can be re-added when those issues are resolved.
+ # clean_storeconfigs(node, unexport)
end
# clean signed cert for +host+