diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 12:19:15 -0800 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2011-12-30 12:19:15 -0800 |
| commit | ed0de46a2a0661a2457e5fed43a5c76f77414704 (patch) | |
| tree | fc19a51734b04ec1af865679e16d8b4d2a29a174 /spec/unit/puppet | |
| parent | 80c9a8feeae6203026f61215e100e95078c61a04 (diff) | |
| parent | 842b0aa19cecf8251c69cb29fba59c985841c615 (diff) | |
Merge branch '2.1.x' into 2.2.x
* 2.1.x:
Update Modulefile CHANGELOG for v2.1.2 release
Conflicts:
CHANGELOG
Modulefile
Diffstat (limited to 'spec/unit/puppet')
0 files changed, 0 insertions, 0 deletions