Merge branch '2.7.x' into 3.1.x

Conflicts: ext/build_defaults.yaml
pruan-rht · Mar 1, 2013 · 0a86a3f · 0a86a3f
2 parents 51dab2e + 056a22e
commit 0a86a3f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/build_defaults.yaml b/ext/build_defaults.yaml
@@ -9,7 +9,7 @@ gpg_name: '[email protected]'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-5-i386 pl-6-i386 fedora-16-i386 fedora-17-i386 fedora-18-i386'
+final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-fedora-16-i386 pl-fedora-17-i386 pl-fedora-18-i386'
 yum_host: 'burji.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE