[6.0] 1586cfc6c Revert "Prepare for 6.0.7"

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Wed Nov 4 12:34:07 UTC 2020


commit 1586cfc6c21b4edb52c780b3a64398ba2d3f60d1
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Wed Nov 4 13:32:43 2020 +0100

    Revert "Prepare for 6.0.7"
    
    This reverts commit 4f99d164e7a43f2ae246daa4e73eefcb1fc78e5a.
    
    This was merged before review, by mistake. I am reverting this so that
    we can do the quality assurence before the actual merge. Sorry.

diff --git a/configure.ac b/configure.ac
index 65b88bda9..1768ee068 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
-Copyright (c) 2006-2020 Varnish Software])
+Copyright (c) 2006-2019 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [6.0.7], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [6.0.6], [varnish-dev at varnish-cache.org])
 AC_CONFIG_SRCDIR(include/miniobj.h)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/doc/changes.rst b/doc/changes.rst
index 47862e467..228c4210e 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -27,7 +27,7 @@ individual releases. These documents are updated as part of the
 release process.
 
 ================================
-Varnish Cache 6.0.7 (2020-10-05)
+Varnish Cache 6.0.7 (YYYY-MM-DD)
 ================================
 
 * Add support for more HTTP response code reasons (3428_).
diff --git a/doc/sphinx/index.rst b/doc/sphinx/index.rst
index e5c33b1e4..e86d038fe 100644
--- a/doc/sphinx/index.rst
+++ b/doc/sphinx/index.rst
@@ -37,7 +37,7 @@ Longer listings like example command output and VCL look like this::
     $ /opt/varnish/sbin/varnishd -V
     varnishd (varnish-trunk revision 199de9b)
     Copyright (c) 2006 Verdens Gang AS
-    Copyright (c) 2006-2020 Varnish Software AS
+    Copyright (c) 2006-2019 Varnish Software AS
 
 
 .. For maintainers:
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index 087289e51..b2258ccde 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -44,5 +44,5 @@ VCS_Message(const char *progname)
 {
 	fprintf(stderr, "%s (%s)\n", progname, VCS_version);
 	fprintf(stderr, "Copyright (c) 2006 Verdens Gang AS\n");
-	fprintf(stderr, "Copyright (c) 2006-2020 Varnish Software AS\n");
+	fprintf(stderr, "Copyright (c) 2006-2019 Varnish Software AS\n");
 }


More information about the varnish-commit mailing list