(PUP-4094) Update environment_timeout default in example environment.…

…conf file ...and recommend setting it in puppet.conf instead.
avisheksarkar20 · Mar 18, 2015 · 2d8d372 · 2d8d372
1 parent 190fdaf
commit 2d8d372
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/conf/environment.conf b/conf/environment.conf
@@ -11,6 +11,8 @@
 # Allowed settings and default values:
 
 # modulepath = ./modules:$basemodulepath
-# manifest = (default_manifest from puppet.conf; defaults to ./manifests)
+# manifest = (default_manifest from puppet.conf, which defaults to ./manifests)
 # config_version = (no script; Puppet will use the time the catalog was compiled)
-# environment_timeout = (environment_timeout from puppet.conf; defaults to unlimited)
+# environment_timeout = (environment_timeout from puppet.conf, which defaults to 0)
+    # Note: unless you have a specific reason, we recommend only setting
+    # environment_timeout in puppet.conf.