diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 15:37:19 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-04 15:37:23 -0700 |
| commit | 6acfdba87bdffe4afd6e00cbf3695160f7994357 (patch) | |
| tree | 30d09c8a40073f6d9fa95c8bef0d4a18b462c348 /spec/unit/util/rdoc/parser_spec.rb | |
| parent | 1a00c07971c4297bce1b3e0edee3b6b3399e17bb (diff) | |
| parent | 6dd1930ff66f6e89ff3d7edba9cc20126d9cd9a3 (diff) | |
| download | puppet-6acfdba87bdffe4afd6e00cbf3695160f7994357.tar.gz puppet-6acfdba87bdffe4afd6e00cbf3695160f7994357.tar.xz puppet-6acfdba87bdffe4afd6e00cbf3695160f7994357.zip | |
Partial merge to 2.6.2rc1 : Merge commits 'd057b90' and '6dd1930' into next
This commit merges in d057b90 with the addition of commit 6dd1930 to fix
some tests that are confined to machines where rrd is installed.
Diffstat (limited to 'spec/unit/util/rdoc/parser_spec.rb')
0 files changed, 0 insertions, 0 deletions