diff options
| author | Rein Henrichs <rein@puppetlabs.com> | 2010-10-05 10:42:52 -0700 |
|---|---|---|
| committer | Rein Henrichs <rein@puppetlabs.com> | 2010-10-05 10:42:52 -0700 |
| commit | dce8f5727c4b6ee0332500c189775cc7c036e6d0 (patch) | |
| tree | 8f334730a79a5b94e5f752dcb55f73ecebd90867 /bin/facter | |
| parent | 74ce28698714acace4d588a7639bd8bd70144f3a (diff) | |
| parent | 07f186d5a858412c0608c368806825e1e44efd4c (diff) | |
| download | facter-dce8f5727c4b6ee0332500c189775cc7c036e6d0.tar.gz facter-dce8f5727c4b6ee0332500c189775cc7c036e6d0.tar.xz facter-dce8f5727c4b6ee0332500c189775cc7c036e6d0.zip | |
Merge branch 'ticket/master/4552' into next
Conflicts:
bin/facter
lib/facter/application.rb
Diffstat (limited to 'bin/facter')
| -rwxr-xr-x | bin/facter | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -36,6 +36,9 @@ # trace:: # Enable backtraces. # +# timing:: +# Enable timing. +# # = Example # # facter kernel |