Commit 2daa1b89 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents b436fdf0 6311a55d
......@@ -16,3 +16,7 @@
[template-erp5testnode]
filename = instance.cfg.in
md5sum = 681f4159e4ac2542d0fbc7a894e43d79
[template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
md5sum = bfa3dcf9b44a4ccb4bda595859ecbbf7
......@@ -11,8 +11,6 @@ url = http://www.nexedi.org/static/slapos/kvm_resiliency_test/virtual.qcow.gz
md5sum = dd82c771f6f7738fb4b0fc1330ed8236
[template-resilient-test]
filename = instance-kvm-resilient-test.cfg.jinja2
md5sum = 5f255502973530181ee45d93fa00a3c4
# Ingest extra-context, on a the final template-resilient-test rendering
# always ingest raw values.
extra-context =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment