summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.vserver')
-rw-r--r--ChangeLog.vserver15
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog.vserver b/ChangeLog.vserver
index 138abb1..3658feb 100644
--- a/ChangeLog.vserver
+++ b/ChangeLog.vserver
@@ -1,6 +1,21 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2
+ 17 Feb 2006; Christian Heim <phreak@gentoo.org>:
+ Merging latest changes to the rc-scripts branch. This merge is based
+ upon revision 1909.
+
+ ChangeLog | 17 ++++-
+ ChangeLog.vserver | 15 ++++
+ net-scripts/conf.d/net.example | 55 ++++++++++++++----
+ net-scripts/net.modules.d/helpers.d/dhcp | 4 -
+ net-scripts/net.modules.d/helpers.d/functions | 4 -
+ net-scripts/net.modules.d/iproute2 | 28 ---------
+ net-scripts/net.modules.d/pppd | 8 +-
+ net-scripts/net.modules.d/tuntap | 43 +++++++-------
+ sbin/rc-daemon.sh | 6 -
+ 9 files changed, 108 insertions(+), 72 deletions(-)
+
14 Feb 2006; Christian Heim <phreak@gentoo.org>:
Importing latest baselayout/trunk changes. This merge is based upon
revision 1881.