[master] decf4be9f Back to trunk

[PÃ¥l Hermunn Johansen]

commit decf4be9fe23a742a5dafc083c8b10e5e29b5d76
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Tue Sep 18 11:48:26 2018 +0200

    Back to trunk
    
    Varnish Cache 6.1.0 has been released, and we are moving
    back to trunk. A 6.1 branch was created from the preivious
    "Prepare for.." commit.

diff --git a/configure.ac b/configure.ac
index cb2d76888..7cbbe53be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2006 Verdens Gang AS
 Copyright (c) 2006-2018 Varnish Software])
 AC_REVISION([$Id$])
-AC_INIT([Varnish], [6.1.0], [varnish-dev at varnish-cache.org])
+AC_INIT([Varnish], [trunk], [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 f9a1eb4c1..109bc066f 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -26,6 +26,9 @@ http://varnish-cache.org/docs/trunk/whats-new/index.html and via
 individual releases. These documents are updated as part of the
 release process.
 
+=============================
+Varnish Cache trunk (ongoing)
+=============================
 
 ================================
 Varnish Cache 6.1.0 (2018-09-17)