summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-01-11 17:34:24 +0000
committerChristian Heim <phreak@gentoo.org>2006-01-11 17:34:24 +0000
commitc2550355e10a1a15e60934b327b6683b65b28291 (patch)
treef659abeb2356909878851d2f11b237738c93e9fc /ChangeLog.vserver
parentr1799 (diff)
downloadbaselayout-vserver-c2550355e10a1a15e60934b327b6683b65b28291.tar.gz
baselayout-vserver-c2550355e10a1a15e60934b327b6683b65b28291.tar.bz2
baselayout-vserver-c2550355e10a1a15e60934b327b6683b65b28291.zip
Merging r1802
svn path=/baselayout-vserver/trunk/; revision=204
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver14
1 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 24ab7e6..24e03b1 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,20 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPLv2
+ 11 Jan 2005; Christian Heim <phreak@gentoo.org>:
+ Importing latest baselayout/trunk changes. This merge is based upon
+ revision 1802.
+
+ ChangeLog | 10 +
+ ChangeLog.vserver | 14 +
+ etc/conf.d/rc | 14 -
+ net-scripts/init.d/net.lo | 2
+ net-scripts/net.modules.d/bonding | 16 +-
+ sbin/rc-daemon.sh | 9 +
+ sbin/rc-services.sh | 6
+ sbin/runscript.sh | 133 ++++++++++++------
+ 8 files changed, 151 insertions(+), 53 deletions(-)
+
10 Jan 2005; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1799.