jenkins-bot has submitted this change and it was merged.
Change subject: Fix branch selection for Varnish
......................................................................
Fix branch selection for Varnish
The latest version of the modules is meant for Varnish 5
Change-Id: I144859b8af3d4c26f205e13f67cbb34938ac863f
---
M puppet/modules/varnish/manifests/init.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/varnish/manifests/init.pp
b/puppet/modules/varnish/manifests/init.pp
index e03a818..3583484 100644
--- a/puppet/modules/varnish/manifests/init.pp
+++ b/puppet/modules/varnish/manifests/init.pp
@@ -38,9 +38,9 @@
# We need to build from source because the tbf vmod needs the
# built source, can't rely only on the headers
git::clone { 'Varnish-Cache':
- branch => '4.1',
+ branch => 'varnish-4.1.3',
directory => '/tmp/Varnish-Cache',
- remote => 'https://github.com/varnish/Varnish-Cache',
+ remote => 'https://github.com/varnishcache/varnish-cache',
}
file { '/tmp/build-varnish.sh':
@@ -195,6 +195,7 @@
# Build and install vmods (which include xkey)
git::clone { 'varnish-modules':
+ branch => 'varnish-modules-0.9.1',
directory => '/tmp/varnish-modules',
remote => 'https://github.com/varnish/varnish-modules',
}
--
To view, visit https://gerrit.wikimedia.org/r/312840
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I144859b8af3d4c26f205e13f67cbb34938ac863f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
