[experimental-ims] 9fe1576 Merged conditional backend request feature

Geoff Simmons geoff at varnish-cache.org
Wed Aug 31 16:04:56 CEST 2011


commit 9fe157683ffe2d18ae8259f4579f32151fabfcb6
Author: Geoff Simmons <geoff at uplex.de>
Date:   Thu Jun 2 21:42:28 2011 +0200

    Merged conditional backend request feature

diff --git a/bin/varnishtest/tests/i00000.vtc b/bin/varnishtest/tests/i00000.vtc
index 4c4aeb5..112703a 100644
--- a/bin/varnishtest/tests/i00000.vtc
+++ b/bin/varnishtest/tests/i00000.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "VCL compiler coverage test: conditional refresh extension"
+=======
+test "VCL compiler coverage test: conditional refresh extension"
+>>>>>>> Merged conditional backend request feature
 
 ## stale_obj is r/o in miss, fetch and error, illegal everywhere else
 
diff --git a/bin/varnishtest/tests/i00001.vtc b/bin/varnishtest/tests/i00001.vtc
index 306cc57..814ee1d 100644
--- a/bin/varnishtest/tests/i00001.vtc
+++ b/bin/varnishtest/tests/i00001.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Test basic conditional requests to backends"
+=======
+test "Test basic conditional requests to backends"
+>>>>>>> Merged conditional backend request feature
 
 ## By default (default_keep = default_grace), cond. requests happen during grace
 
diff --git a/bin/varnishtest/tests/i00002.vtc b/bin/varnishtest/tests/i00002.vtc
index adae568..0817008 100644
--- a/bin/varnishtest/tests/i00002.vtc
+++ b/bin/varnishtest/tests/i00002.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "handling stale_obj in vcl_miss() and vcl_fetch()"
+=======
+test "handling stale_obj in vcl_miss() and vcl_fetch()"
+>>>>>>> Merged conditional backend request feature
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00003.vtc b/bin/varnishtest/tests/i00003.vtc
index 293e843..6711f61 100644
--- a/bin/varnishtest/tests/i00003.vtc
+++ b/bin/varnishtest/tests/i00003.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Test some anticipated use cases for conditional backend requests"
+=======
+test "Test some anticipated use cases for conditional backend requests"
+>>>>>>> Merged conditional backend request feature
 
 ## In vcl_miss(), it is possible to veto a conditional request by removing any
 ## If-Modified-Since or If-None-Match header.
diff --git a/bin/varnishtest/tests/i00004.vtc b/bin/varnishtest/tests/i00004.vtc
index bb70176..701e167 100644
--- a/bin/varnishtest/tests/i00004.vtc
+++ b/bin/varnishtest/tests/i00004.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Verify the semantics of keep (timeout for conditional requests)"
+=======
+test "Verify the semantics of keep (timeout for conditional requests)"
+>>>>>>> Merged conditional backend request feature
 
 server s1 {
         rxreq
diff --git a/bin/varnishtest/tests/i00005.vtc b/bin/varnishtest/tests/i00005.vtc
index 983afb2..24e3968 100644
--- a/bin/varnishtest/tests/i00005.vtc
+++ b/bin/varnishtest/tests/i00005.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Verify interactions of ttl, keep, grace and bans"
+=======
+test "Verify interactions of ttl, keep, grace and bans"
+>>>>>>> Merged conditional backend request feature
 
 ## Banned objects are not used for conditional requests
 
diff --git a/bin/varnishtest/tests/i00006.vtc b/bin/varnishtest/tests/i00006.vtc
index db15078..6eb6b2f 100644
--- a/bin/varnishtest/tests/i00006.vtc
+++ b/bin/varnishtest/tests/i00006.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Verify effects of ttl, keep and grace on expiration"
+=======
+test "Verify effects of ttl, keep and grace on expiration"
+>>>>>>> Merged conditional backend request feature
 
 ## Verify that an object's lifetime in the cache is
 ## obj.ttl + max(obj.grace, obj.keep)
diff --git a/bin/varnishtest/tests/i00007.vtc b/bin/varnishtest/tests/i00007.vtc
index 4a9b8c0..31193f9 100644
--- a/bin/varnishtest/tests/i00007.vtc
+++ b/bin/varnishtest/tests/i00007.vtc
@@ -1,6 +1,10 @@
 # $Id$
 
+<<<<<<< HEAD
 varnishtest "Passes through responses to backend conditionals to the client if status != 304 or 200"
+=======
+test "Passes through responses to backend conditionals to the client if status != 304 or 200"
+>>>>>>> Merged conditional backend request feature
 
 # Testing a sample from each of the Nxx status codes
 



More information about the varnish-commit mailing list