projects / puppet_vcsrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dd23c0e 9d5cac1)
Merge branch '1.1.x'
authorHunter Haugen <hunter@puppetlabs.com>
Mon, 15 Sep 2014 20:41:04 +0000 (13:41 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Mon, 15 Sep 2014 20:41:04 +0000 (13:41 -0700)
1  2 
spec/spec_helper_acceptance.rb patch | diff1 | diff2 | blob | history

diff --cc spec/spec_helper_acceptance.rb
Simple merge
[puppet_vcsrepo]