summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver21
1 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index a785303..3045ad6 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,27 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 15 Jan 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the baselayout-1_12 branch. This merge is based
+ upon revision 1822.
+
+ ChangeLog | 24 +
+ ChangeLog.vserver | 21 +
+ bin/rc-status | 3
+ etc/conf.d/rc | 6
+ net-scripts/init.d/net.lo | 9
+ net-scripts/net.modules.d/bonding | 4
+ net-scripts/net.modules.d/bridge | 4
+ net-scripts/net.modules.d/helpers.d/functions | 6
+ net-scripts/net.modules.d/ifconfig | 7
+ net-scripts/net.modules.d/iproute2 | 5
+ sbin/functions.sh | 2
+ sbin/rc | 6
+ sbin/rc-daemon.sh | 26 -
+ sbin/rc-services.sh | 27 -
+ sbin/runscript.sh | 258 ++++++++++--------
+ 15 files changed, 251 insertions(+), 157 deletions(-)
+
11 Jan 2006; Christian Heim <phreak@gentoo.org>:
Merging latest changes to the baselayout-1_12 branch. This merge is based
upon revision 1802.