[DRBD-cvs] svn commit by lars - r2222 - in branches/drbd-0.7: . documentation drbd scripts user - * Corrected some spelling errors in the recent document

drbd-cvs at lists.linbit.com drbd-cvs at lists.linbit.com
Fri May 26 17:24:00 CEST 2006


Author: lars
Date: 2006-05-26 17:23:55 +0200 (Fri, 26 May 2006)
New Revision: 2222

Modified:
   branches/drbd-0.7/ChangeLog
   branches/drbd-0.7/documentation/drbd.conf.sgml
   branches/drbd-0.7/documentation/drbd.sgml
   branches/drbd-0.7/documentation/drbdadm.sgml
   branches/drbd-0.7/documentation/drbddisk.sgml
   branches/drbd-0.7/documentation/drbdsetup.sgml
   branches/drbd-0.7/drbd/drbd_actlog.c
   branches/drbd-0.7/drbd/drbd_bitmap.c
   branches/drbd-0.7/drbd/drbd_fs.c
   branches/drbd-0.7/drbd/drbd_int.h
   branches/drbd-0.7/drbd/drbd_main.c
   branches/drbd-0.7/drbd/drbd_proc.c
   branches/drbd-0.7/drbd/drbd_receiver.c
   branches/drbd-0.7/drbd/drbd_req.c
   branches/drbd-0.7/drbd/drbd_worker.c
   branches/drbd-0.7/drbd/lru_cache.c
   branches/drbd-0.7/drbd/lru_cache.h
   branches/drbd-0.7/scripts/drbd.conf
   branches/drbd-0.7/scripts/patch-kernel
   branches/drbd-0.7/user/drbdadm_adjust.c
   branches/drbd-0.7/user/drbdadm_main.c
   branches/drbd-0.7/user/drbdsetup.c
Log:

* Corrected some spelling errors in the recent documentation,
  and added bdev-threshold to drbd.conf.sgml
* removed references to freeze io from the manpages:
  we did not implement it in 0.7.x
* adjusted some copyright comments



Modified: branches/drbd-0.7/ChangeLog
===================================================================
--- branches/drbd-0.7/ChangeLog	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/ChangeLog	2006-05-26 15:23:55 UTC (rev 2222)
@@ -1,6 +1,6 @@
 Latest:
 ------
- ChangeLog last updated: r2211 2006-05-24
+ ChangeLog last updated: $LastChangedRev$ $LastChangedDate$
  Cumulative changes since last tarball.
  For even more detail, use "svn log" and "svn diff".
 


Property changes on: branches/drbd-0.7/ChangeLog
___________________________________________________________________
Name: svn:keywords
   + LastChangedRev LastChangedDate

Modified: branches/drbd-0.7/documentation/drbd.conf.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbd.conf.sgml	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/documentation/drbd.conf.sgml	2006-05-26 15:23:55 UTC (rev 2222)
@@ -175,6 +175,7 @@
     <option>sndbuf-size</option>, <option>timeout</option>,
     <option>connect-int</option>, <option>ping-int</option>,
     <option>max-buffers</option>, <option>max-epoch-size</option>,
+    <option>bdev-treshold</option>,
     <option>ko-count</option>, <option>on-disconnect</option>.
   </para>
   </listitem>
@@ -427,6 +428,21 @@
 </varlistentry>
 
 <varlistentry>
+  <term><option>bdev-treshold <replaceable>number</replaceable></option></term>
+  <listitem>
+    <para>
+      When the number of pending write requests on the standby
+      (secondary) node exceeds the bdev-treshold, we trigger
+      the request processing of our backing storage device.
+      Some storage controllers deliver better performance with small
+      values, other deliver best performance when it is set to
+      the same value as max-buffers. Minimum 16, default 128, maximum
+      131072.
+    </para>
+  </listitem>
+</varlistentry>
+
+<varlistentry>
   <term><option>ko-count <replaceable>count</replaceable></option></term>
   <listitem><para>
   In case the secondary node fails to complete a single write request
@@ -441,17 +457,14 @@
   <term><option>on-disconnect <replaceable>handler</replaceable></option></term>
   <listitem><para>
   When the connection to the peer is lost, DRBD can either
-  go into stand alone mode, try to reconnect to the peer or
-  freeze all further IO requests (think of an NFS hard mount).
-  Valid handler specifiers are <option>stand_alone</option>,
-  <option>reconnect</option> and <option>freeze_io</option>.
+  go into stand alone mode, or try to reconnect to the peer.
+  Valid handler specifiers are <option>stand_alone</option> and
+  <option>reconnect</option>.
   The default handler is <option>reconnect</option>.
   </para>
   <para><option>stand_alone</option>: Do not reconnect, go into
   StandAlone state.</para>
   <para><option>reconnect</option>: Try to reconnect.</para>
-  <para><option>freeze_io</option>: Try to reconnect, but freeze all
-  IO until the connection is established again.</para>
   </listitem>
 </varlistentry>
 
@@ -530,7 +543,7 @@
 </refsect1>
 <refsect1>
 <title>Version</title>
-<simpara>This document is correct for version 0.7.15 of the DRBD distribution.
+<simpara>This document is correct for version 0.7.20 of the DRBD distribution.
 </simpara>
 </refsect1>
 <refsect1>
@@ -547,7 +560,7 @@
 <refsect1>
 <title>Copyright</title>
 <simpara>
-Copyright (c) 2001-2005 Philipp Reisner. This  is  free software; 
+Copyright (c) 2001-2006 Philipp Reisner. This  is  free software; 
 see the source for copying conditions.  There is NO warranty; 
 not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 </simpara>

Modified: branches/drbd-0.7/documentation/drbd.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbd.sgml	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/documentation/drbd.sgml	2006-05-26 15:23:55 UTC (rev 2222)
@@ -53,7 +53,7 @@
 
 <refsect1>
   <title>Version</title>
-  <simpara>This document is correct for version 0.7.15 of the DRBD distribution.
+  <simpara>This document is correct for version 0.7.20 of the DRBD distribution.
   </simpara>
 </refsect1>
 
@@ -74,7 +74,7 @@
 <refsect1>
   <title>Copyright</title>
   <simpara>
-    Copyright (c) 2001-2005 Philipp Reisner. This  is  free software; 
+    Copyright (c) 2001-2006 Philipp Reisner. This  is  free software; 
     see the source for copying conditions.  There is NO warranty; 
     not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   </simpara>

Modified: branches/drbd-0.7/documentation/drbdadm.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbdadm.sgml	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/documentation/drbdadm.sgml	2006-05-26 15:23:55 UTC (rev 2222)
@@ -192,7 +192,7 @@
   <refsect1>
     <title>Version</title>
     <simpara>
-      This document is correct for version 0.7.15 of the DRBD distribution.
+      This document is correct for version 0.7.20 of the DRBD distribution.
     </simpara>
   </refsect1>
 
@@ -209,7 +209,7 @@
   <refsect1>
     <title>Copyright</title>
     <simpara>
-      Copyright (c) 2004-2005 Philipp Reisner. This  is  free software; 
+      Copyright (c) 2004-2006 Philipp Reisner. This  is  free software; 
       see the source for copying conditions.  There is NO warranty; 
       not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     </simpara>

Modified: branches/drbd-0.7/documentation/drbddisk.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbddisk.sgml	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/documentation/drbddisk.sgml	2006-05-26 15:23:55 UTC (rev 2222)
@@ -45,7 +45,7 @@
 
 <refsect1>
 <title>Version</title>
-<simpara>This document is correct for version 0.7.15 of the DRBD distribution.
+<simpara>This document is correct for version 0.7.20 of the DRBD distribution.
 </simpara>
 </refsect1>
 
@@ -66,7 +66,7 @@
 <refsect1>
   <title>Copyright</title>
   <simpara>
-    Copyright (c) 2004-2005 Philipp Reisner. This  is  free software; 
+    Copyright (c) 2004-2006 Philipp Reisner. This  is  free software; 
     see the source for copying conditions.  There is NO warranty; 
     not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   </simpara>

Modified: branches/drbd-0.7/documentation/drbdsetup.sgml
===================================================================
--- branches/drbd-0.7/documentation/drbdsetup.sgml	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/documentation/drbdsetup.sgml	2006-05-26 15:23:55 UTC (rev 2222)
@@ -318,10 +318,10 @@
 	  <listitem>
 	    <para>
 	      When the number of pending write requests on the standby
-	      (secondary) nodes goes over bdev-treshold we trigger
-	      the request processing of out backing storage device.
+	      (secondary) node exceeds the bdev-treshold, we trigger
+	      the request processing of our backing storage device.
 	      Some storage controllers deliver better performance with small
-	      values, other delivers beste performance when it is set to
+	      values, other deliver best performance when it is set to
 	      the same value as max-buffers. Minimum 16, default 128, maximum
 	      131072.
 	    </para>
@@ -333,10 +333,9 @@
 	  <listitem>
 	    <para>
 	      When the connection to the peer is lost, DRBD can either
-	      go into stand alone mode, try to reconnect to the peer or
-	      freeze all further IO requests (think of an NFS hard mount).
-	      The keywords are: <option>stand_alone</option>, 
-	      <option>reconnect</option> and <option>freeze_io</option>.
+	      go into stand alone mode, or try to reconnect to the peer.
+	      The keywords are: <option>stand_alone</option> and
+	      <option>reconnect</option>.
 	      The default handler is <option>reconnect</option>.
 	    </para>
 	  </listitem>
@@ -612,7 +611,7 @@
 
   <refsect1>
     <title>Version</title>
-    <simpara>This document is correct for version 0.7.15 of the DRBD distribution.
+    <simpara>This document is correct for version 0.7.20 of the DRBD distribution.
     </simpara>
   </refsect1>
 
@@ -629,7 +628,7 @@
   <refsect1>
     <title>Copyright</title>
     <simpara>
-      Copyright (c) 2001-2005 Philipp Reisner. This  is  free software; 
+      Copyright (c) 2001-2006 Philipp Reisner. This  is  free software; 
       see the source for copying conditions.  There is NO warranty; 
       not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
     </simpara>

Modified: branches/drbd-0.7/drbd/drbd_actlog.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_actlog.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_actlog.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,9 +5,9 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2003-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-   Copyright (C) 2003-2004, Lars Ellenberg <l.g.e at web.de>.
-        authors.
+   Copyright (C) 2003-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2003-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2003-2006, LINBIT Information Technologies GmbH.
 
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: branches/drbd-0.7/drbd/drbd_bitmap.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_bitmap.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_bitmap.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2004, Lars Ellenberg <l.g.e at web.de>.
-	main author.
+   Copyright (C) 2004-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2004-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2004-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	contributions.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/drbd/drbd_fs.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_fs.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_fs.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
    Copyright (C) 2000, Fábio Olivé Leite <olive at conectiva.com.br>.
 	Some sanity checks in IOCTL_SET_STATE.
 

Modified: branches/drbd-0.7/drbd/drbd_int.h
===================================================================
--- branches/drbd-0.7/drbd/drbd_int.h	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_int.h	2006-05-26 15:23:55 UTC (rev 2222)
@@ -4,12 +4,10 @@
 
   This file is part of drbd by Philipp Reisner.
 
-  Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+  Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+  Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+  Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-  Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
   drbd is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/drbd/drbd_main.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_main.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_main.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
    Copyright (C) 2000, Marcelo Tosatti <marcelo at conectiva.com.br>.
 	Early 2.3.x work.
 

Modified: branches/drbd-0.7/drbd/drbd_proc.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_proc.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_proc.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/drbd/drbd_receiver.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_receiver.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_receiver.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/drbd/drbd_req.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_req.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_req.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,12 +5,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-	main author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>.
-	main contributor.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/drbd/drbd_worker.c
===================================================================
--- branches/drbd-0.7/drbd/drbd_worker.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/drbd_worker.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,9 +5,9 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2003-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-   Copyright (C) 2003-2004, Lars Ellenberg <l.g.e at web.de>.
-	authors.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: branches/drbd-0.7/drbd/lru_cache.c
===================================================================
--- branches/drbd-0.7/drbd/lru_cache.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/lru_cache.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,9 +5,9 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2003-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-   Copyright (C) 2003-2004, Lars Ellenberg <l.g.e at web.de>.
-        authors.
+   Copyright (C) 2003-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2003-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2003-2006, LINBIT Information Technologies GmbH.
 
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: branches/drbd-0.7/drbd/lru_cache.h
===================================================================
--- branches/drbd-0.7/drbd/lru_cache.h	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/drbd/lru_cache.h	2006-05-26 15:23:55 UTC (rev 2222)
@@ -5,8 +5,9 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2003-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-        main author.
+   Copyright (C) 2003-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2003-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2003-2006, LINBIT Information Technologies GmbH.
 
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Modified: branches/drbd-0.7/scripts/drbd.conf
===================================================================
--- branches/drbd-0.7/scripts/drbd.conf	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/scripts/drbd.conf	2006-05-26 15:23:55 UTC (rev 2222)
@@ -173,13 +173,13 @@
     # max-buffers     2048;
 
     # When the number of outstanding requests on a standby (secondary)
-    # node goes over bdev-reshold we start to kick the backing device
+    # node exceeds bdev-threshold, we start to kick the backing device
     # to start its request processing. This is an advanced tuning
     # parameter to get more performance out of capable storage controlers.
-    # Some controlers likes to be kicked often, other controlers 
-    # deliver better performance when the are kicked less frequently.
+    # Some controlers like to be kicked often, other controlers 
+    # deliver better performance when they are kicked less frequently.
     # Set it to the value of max-buffers to get the least possible
-    # number of run_task_queue_disk() calls.
+    # number of run_task_queue_disk() / q->unplug_fn(q) calls.
     #
     # bdev-treshold   128;
 
@@ -197,6 +197,9 @@
     #  "stand_alone" -> Do not reconnect (AKA StandAlone state)
     #  "freeze_io"   -> Try to reconnect but freeze all IO until
     #                   the connection is established again.
+    #  [ lge: oops. freeze_io is not implemented yet...       ]
+    #  [ at least not in drbd 0.7.x; but nobody wanted to use ]
+    #  [ that anyways, otherwise we had noticed earlier :-)   ]
     # on-disconnect reconnect;
 
   }

Modified: branches/drbd-0.7/scripts/patch-kernel
===================================================================
--- branches/drbd-0.7/scripts/patch-kernel	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/scripts/patch-kernel	2006-05-26 15:23:55 UTC (rev 2222)
@@ -6,6 +6,9 @@
 #
 # Copyright (C) 2003 Kees Cook, OSDL
 # kees at osdl.org, http://developer.osdl.org/kees/
+#
+# Copyright (C) 2003-2006 LINBIT Information Technologies GmbH
+# http://www.linbit.com
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

Modified: branches/drbd-0.7/user/drbdadm_adjust.c
===================================================================
--- branches/drbd-0.7/user/drbdadm_adjust.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/user/drbdadm_adjust.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -3,7 +3,7 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2003-2004, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2003-2006, Philipp Reisner <philipp.reisner at linbit.com>.
         Initial author.
 
    drbd is free software; you can redistribute it and/or modify

Modified: branches/drbd-0.7/user/drbdadm_main.c
===================================================================
--- branches/drbd-0.7/user/drbdadm_main.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/user/drbdadm_main.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -3,12 +3,10 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 2002-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-        Initial author.
+   Copyright (C) 2002-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2002-2006, LINBIT Information Technologies GmbH.
 
-   Copyright (C) 2003-2004, Lars Ellenberg <l.g.e at web.de>
-        contributions.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)

Modified: branches/drbd-0.7/user/drbdsetup.c
===================================================================
--- branches/drbd-0.7/user/drbdsetup.c	2006-05-26 14:21:51 UTC (rev 2221)
+++ branches/drbd-0.7/user/drbdsetup.c	2006-05-26 15:23:55 UTC (rev 2222)
@@ -3,15 +3,13 @@
 
    This file is part of drbd by Philipp Reisner.
 
-   Copyright (C) 1999-2004, Philipp Reisner <philipp.reisner at linbit.com>.
-        Initial author.
+   Copyright (C) 1999-2006, Philipp Reisner <philipp.reisner at linbit.com>.
+   Copyright (C) 2002-2006, Lars Ellenberg <lars.ellenberg at linbit.com>.
+   Copyright (C) 2001-2006, LINBIT Information Technologies GmbH.
 
    Copyright (C) 2000, Fábio Olivé Leite <olive at conectiva.com.br>.
         Added sanity checks before using the device.
 
-   Copyright (C) 2002-2004, Lars Ellenberg <l.g.e at web.de>
-	main contributor.
-
    drbd is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)



More information about the drbd-cvs mailing list