From: Andre Noll
Date: Fri, 12 Dec 2014 13:21:53 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/min-complete'
X-Git-Tag: v0.1.6~16
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=15eb99dcf9a30f8c8d488d5bc3c92130cf828d60;hp=b76728084d7b36d55e08764c9de42ad59fd6f6fd
Merge branch 'refs/heads/t/min-complete'
---
diff --git a/NEWS b/NEWS
index b03b66c..eb96db6 100644
--- a/NEWS
+++ b/NEWS
@@ -2,25 +2,25 @@
0.1.5 (2014-01-14)
------------------
-- snapshot recycling: outdated, redundant and orphaned snapshots are
- reused as the basis for new snapshots.
+ - snapshot recycling: outdated, redundant and orphaned snapshots are
+ reused as the basis for new snapshots.
-- New subcommands: --kill, --reload.
+ - New subcommands: --kill, --reload.
-- The semaphore-based locking system prevents to start multiple
- instances of dss.
+ - The semaphore-based locking system prevents to start multiple
+ instances of dss.
-- When dss receives SIGHUP it now writes the internal state and the
- configuration to the log file
+ - When dss receives SIGHUP it now writes the internal state and the
+ configuration to the log file
-- First steps to make the source code ANSI C conform (thanks to
- Daniel Richard G).
+ - First steps to make the source code ANSI C conform (thanks to
+ Daniel Richard G).
-- dss writes log messages to stderr rather than to the logfile unless
- running in daemon mode.
+ - dss writes log messages to stderr rather than to the logfile unless
+ running in daemon mode.
-- Default hooks work also on systems where "/bin/true" does not exist,
- e.g. Mac OS.
+ - Default hooks work also on systems where "/bin/true" does not exist,
+ e.g. Mac OS.
0.1.4 (2010-11-08)
~~~~~~~~~~~~~~~~~~
diff --git a/daemon.c b/daemon.c
index 91a6ff2..b63e5ff 100644
--- a/daemon.c
+++ b/daemon.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2010 Andre Noll
+ * Copyright (C) 1997-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/df.c b/df.c
index 1c2531f..003becc 100644
--- a/df.c
+++ b/df.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2010 Andre Noll
+ * Copyright (C) 2008-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/dss.c b/dss.c
index 9f39324..006cd27 100644
--- a/dss.c
+++ b/dss.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2011 Andre Noll
+ * Copyright (C) 2008-2011 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/dss.ggo b/dss.ggo
index d8b956e..9587dd2 100644
--- a/dss.ggo
+++ b/dss.ggo
@@ -1,4 +1,4 @@
-# Copyright (C) 2008-2010 Andre Noll
+# Copyright (C) 2008-2010 Andre Noll
#
# Licensed under the GPL v2. For licencing details see COPYING.
diff --git a/err.h b/err.h
index 551ff54..e651d9c 100644
--- a/err.h
+++ b/err.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2010 Andre Noll
+ * Copyright (C) 2006-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/exec.c b/exec.c
index 2a40bc0..c08ef39 100644
--- a/exec.c
+++ b/exec.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 Andre Noll
+ * Copyright (C) 2003-2011 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/file.c b/file.c
index 6484218..ef7cd52 100644
--- a/file.c
+++ b/file.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2010 Andre Noll
+ * Copyright (C) 2006-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/file.h b/file.h
index 991afd4..c462b10 100644
--- a/file.h
+++ b/file.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2010 Andre Noll
+ * Copyright (C) 2006-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/index.html.in b/index.html.in
index d984844..a65fe01 100644
--- a/index.html.in
+++ b/index.html.in
@@ -78,7 +78,7 @@
the latest release, select the corresponding snapshot
link on the
- dss gitweb page
+ dss gitweb page
@@ -115,7 +115,7 @@
André Noll, maan@systemlinux.org
+ href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de
Comments and bug reports are welcome. Please provide
enough info such as the version of dss you are using and
relevant parts of the logs. Including the string [dss] in
diff --git a/log.h b/log.h
index ba42210..78ccc1b 100644
--- a/log.h
+++ b/log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1997-2010 Andre Noll
+ * Copyright (C) 1997-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/sig.c b/sig.c
index 2f6f7dd..d2d7e3b 100644
--- a/sig.c
+++ b/sig.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2010 Andre Noll
+ * Copyright (C) 2004-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/sig.h b/sig.h
index dea7cde..912eec2 100644
--- a/sig.h
+++ b/sig.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007-2010 Andre Noll
+ * Copyright (C) 2007-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/snap.c b/snap.c
index ec0449d..7c16d2e 100644
--- a/snap.c
+++ b/snap.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2010 Andre Noll
+ * Copyright (C) 2008-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/snap.h b/snap.h
index c817de2..626ecad 100644
--- a/snap.h
+++ b/snap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2010 Andre Noll
+ * Copyright (C) 2008-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/str.c b/str.c
index 4bca765..d6c768d 100644
--- a/str.c
+++ b/str.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2010 Andre Noll
+ * Copyright (C) 2004-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
diff --git a/tv.c b/tv.c
index ec2cdc2..5beca9d 100644
--- a/tv.c
+++ b/tv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2010 Andre Noll
+ * Copyright (C) 2005-2010 Andre Noll
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/