diff options
| author | Markus Roberts <Markus@reality.com> | 2010-02-06 11:34:16 -0800 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | 07cfdd0a5515eac9d7aafb5c3c53070a753630e0 (patch) | |
| tree | 3d50e38a49da3121c270a56fa552c3cbe63295b7 /spec | |
| parent | ad148d63a638c5ae5709463b97a8f70ce1cce607 (diff) | |
| download | puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.tar.gz puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.tar.xz puppet-07cfdd0a5515eac9d7aafb5c3c53070a753630e0.zip | |
Resolving conflicts with jesse:feature/master/3394
Without this change, rake spec crashes with a message about feature being undefined.
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions