about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-05-05 01:17:59 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-05-05 01:17:59 +0000
commit589b9279cbb28da506f306e0b79c0e4a19b59ef8 (patch)
treeab2681d91da66bb520f551e25fadf35e85a74bd0
parent95157aa7d44750e248665744518f453ec65e2636 (diff)
downloads6-589b9279cbb28da506f306e0b79c0e4a19b59ef8.tar.gz
s6-589b9279cbb28da506f306e0b79c0e4a19b59ef8.tar.xz
s6-589b9279cbb28da506f306e0b79c0e4a19b59ef8.zip
Prepare for 2.10.1.0
-rw-r--r--AUTHORS2
-rw-r--r--NEWS7
-rw-r--r--doc/index.html2
-rw-r--r--doc/upgrade.html7
-rw-r--r--package/info2
5 files changed, 18 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index de090b5..ea20d5f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,3 +38,5 @@ Thanks to:
   Jens Rehsack <rehsack@gmail.com>
   Xavier Stonestreet <xstonestreet@gmail.com>
   Johannes Nixdorf <mixi@shadowice.org>
+  Oliver Schad <oliver.schad@automatic-server.com>
+  Alex Kiernan <alex.kiernan@gmail.com>
diff --git a/NEWS b/NEWS
index 7b2a5ba..7827932 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 Changelog for s6.
 
+In 2.10.1.0
+-----------
+
+ - Bugfixes.
+ - s6-svwait now supports -r and -R options to wait for restarts.
+
+
 In 2.10.0.3
 -----------
 
diff --git a/doc/index.html b/doc/index.html
index 7b76097..d8780a6 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -115,7 +115,7 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.10.0.3.tar.gz">2.10.0.3</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.10.1.0.tar.gz">2.10.1.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 932d4f9..a87f326 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in s6 </h1>
 
+<h2> in 2.10.1.0 </h2>
+
+<ul>
+ <li> <a href="s6-svwait.html">s6-svwait</a> now supports the
+<tt>-r</tt> and <tt>-R</tt> options, to wait for service restarts. </li>
+</ul>
+
 <h2> in 2.10.0.3 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 1d36534..0e11a6e 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.10.0.3
+version=2.10.1.0
 category=admin
 package_macro_name=S6