diff options
author | Christian Heim <phreak@gentoo.org> | 2006-01-17 20:45:43 +0000 |
---|---|---|
committer | Christian Heim <phreak@gentoo.org> | 2006-01-17 20:45:43 +0000 |
commit | 529ad884fab1e9a406eedf57764a2b80db6b4c4c (patch) | |
tree | 400153b706b7cd8da6f1af7bcac6dfd6f3d8c1ed /ChangeLog.vserver | |
parent | Merging r1822 from trunk (diff) | |
download | baselayout-vserver-529ad884fab1e9a406eedf57764a2b80db6b4c4c.tar.gz baselayout-vserver-529ad884fab1e9a406eedf57764a2b80db6b4c4c.tar.bz2 baselayout-vserver-529ad884fab1e9a406eedf57764a2b80db6b4c4c.zip |
Merging r1828
svn path=/baselayout-vserver/trunk/; revision=209
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r-- | ChangeLog.vserver | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver index 0311046..e279dd7 100644 --- a/ChangeLog.vserver +++ b/ChangeLog.vserver @@ -1,7 +1,19 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2 - 15 Jan 2005; Christian Heim <phreak@gentoo.org>: + 17 Jan 2006; Christian Heim <phreak@gentoo.org>: + Importing latest baselayout/trunk changes. This merge is based upon + revision 1828. + + ChangeLog | 13 +++ + ChangeLog.vserver | 18 ++++- + net-scripts/init.d/net.lo | 9 +- + sbin/depscan.sh | 2 + sbin/rc-services.sh | 16 +++- + sbin/runscript.sh | 59 +++++++++--------- + 6 files changed, 73 insertions(+), 44 deletions(-) + + 15 Jan 2006; Christian Heim <phreak@gentoo.org>: Importing latest baselayout/trunk changes. This merge is based upon revision 1822. @@ -22,7 +34,7 @@ sbin/runscript.sh | 258 ++++++++++-------- 15 files changed, 269 insertions(+), 181 deletions(-) - 11 Jan 2005; Christian Heim <phreak@gentoo.org>: + 11 Jan 2006; Christian Heim <phreak@gentoo.org>: Importing latest baselayout/trunk changes. This merge is based upon revision 1802. @@ -36,7 +48,7 @@ sbin/runscript.sh | 133 ++++++++++++------ 8 files changed, 151 insertions(+), 53 deletions(-) - 10 Jan 2005; Christian Heim <phreak@gentoo.org>: + 10 Jan 2006; Christian Heim <phreak@gentoo.org>: Importing latest baselayout/trunk changes. This merge is based upon revision 1799. |