[master] e842e5c Merge branch 'vmodpriv'

[Dag Haavi Finstad]

commit e842e5c07a5bd1f109e52ea57abd858164273b00
Merge: 6b4267b e053076
Author: Dag Haavi Finstad <daghf at varnish-software.com>
Date:   Thu Nov 27 16:58:01 2014 +0100

    Merge branch 'vmodpriv'

diff --cc lib/libvmod_debug/vmod.vcc
index 902f724,1684230..b2b661f
--- a/lib/libvmod_debug/vmod.vcc
+++ b/lib/libvmod_debug/vmod.vcc
@@@ -51,15 -51,11 +51,11 @@@ $Function VOID test_priv_vcl(PRIV_VCL
  
  Test function for VCL private pointers
  
- $Function STRING test_priv_req(PRIV_REQ, STRING)
+ $Function STRING test_priv_task(PRIV_TASK, STRING)
  
- Test function for REQ private pointers
- 
- $Function STRING test_priv_sess(PRIV_SESS, STRING)
- 
- Test function for SESS private pointers
+ Test function for TASK private pointers
  
 -$Function BLOB str2blob(STRING src)
 +$Function BLOB str2blob(STRING src = "foo")
  
  Turn a string into a blob