[vyatta-svn] r2907 - in build: apt base vyatta vyatta/xorp/etc/templates vyatta/xorp/libxipc vyatta/xorp/rl_system vyatta/xorp/rl_xg/html vyatta/xorp/xrl/interfaces
root@vyatta.com
root at vyatta.com
Sun Jul 9 16:45:17 PDT 2006
Author: rbalocca
Date: 2006-07-09 16:45:16 -0700 (Sun, 09 Jul 2006)
New Revision: 2907
Log:
Merge from throttle_01 branch (with the exception of build/vyatta/xorp/etc/templates/rl_system.tp)
svn merge -r2717:2906 http://suva.vyatta.com/svn/repos/vyatta/branch/throttle_01
Here are the respective throttle merge logs:
========================================================================
r2717 | jkrauska | 2006-06-14 23:40:22 -0700 (Wed, 14 Jun 2006) | 2 lines
Changed paths:
M /branch/throttle_01/apt/control
M /branch/throttle_01/kernel/control
M /branch/throttle_01/vyatta/control
Upversion control files (incase this build becomes 1.0)
========================================================================
r2776 | jkrauska | 2006-06-21 14:36:30 -0700 (Wed, 21 Jun 2006) | 3 lines
Changed paths:
M /branch/throttle_01/vyatta/control
M /branch/throttle_01/vyatta/xorp/rl_system/rl_system_node.cc
Fix for bug 1264 -- duplicates showing up in /etc/apt/sources.list
========================================================================
r2777 | mike | 2006-06-21 15:16:28 -0700 (Wed, 21 Jun 2006) | 1 line
Changed paths:
M /branch/throttle_01/vyatta/xorp/etc/templates/rib.cmds
fix for bug 1259--removed errant comment, must have been done via bad merge
========================================================================
r2778 | mike | 2006-06-21 16:48:27 -0700 (Wed, 21 Jun 2006) | 1 line
Changed paths:
M /branch/throttle_01/vyatta/xorp/config/config.sub
M /branch/throttle_01/vyatta/xorp/etc/templates/rl_system.tp
M /branch/throttle_01/vyatta/xorp/rl_system/rl_system_node.cc
M /branch/throttle_01/vyatta/xorp/rl_system/rl_system_node.hh
M /branch/throttle_01/vyatta/xorp/rl_system/xrl_rl_system_node.cc
M /branch/throttle_01/vyatta/xorp/rl_system/xrl_rl_system_node.hh
M /branch/throttle_01/vyatta/xorp/rl_system/xrl_rl_system_shell_funcs.sh
M /branch/throttle_01/vyatta/xorp/xrl/interfaces/rl_system.xif
fix for bug 217--deja vu
========================================================================
r2785 | jkrauska | 2006-06-22 08:37:52 -0700 (Thu, 22 Jun 2006) | 2 lines
Changed paths:
M /branch/throttle_01/vyatta/config.boot.default
fixes bug 1269 -- adds ntp.vyatta.com to default config.
========================================================================
r2786 | mike | 2006-06-22 11:12:07 -0700 (Thu, 22 Jun 2006) | 1 line
Changed paths:
M /branch/throttle_01/vyatta/xorp/rl_service/rl_service_node.cc
fix for bug 1265 applied from main.
========================================================================
r2794 | mike | 2006-06-22 22:18:47 -0700 (Thu, 22 Jun 2006) | 1 line
Changed paths:
M /branch/throttle_01/vyatta/xorp/libxipc/routelogics.hh
M /branch/throttle_01/vyatta/xorp/libxipc/vrrp_set.cc
fix for bug 373, mac address was mis-formatted in argument to xorp, as well as adding back disable/enable of interface on setting mac
========================================================================
r2834 | rbays | 2006-06-28 12:07:51 -0700 (Wed, 28 Jun 2006) | 3 lines
Changed paths:
M /branch/throttle_01/vyatta/xorp/etc/templates/rl_system.tp
bug 1262: RADIUS Authentication Fails
removed authentication-order node
========================================================================
r2837 | jkrauska | 2006-06-28 17:15:37 -0700 (Wed, 28 Jun 2006) | 4 lines
Changed paths:
M /branch/throttle_01/base/inittab
Fixes bug 1276, by writing current clock to hardware clock. (BIOS clock)
Ideally later we'll use normal SysVinit, and build out a /etc/rc6.d, but for now
this is a workable solution.
========================================================================
r2840 | jkrauska | 2006-06-28 23:00:42 -0700 (Wed, 28 Jun 2006) | 3 lines
Changed paths:
M /branch/throttle_01/vyatta/xorp/etc/templates/package.cmds
Fixes bug 1288 - P2, Major - spelling error in help syntax..
(under duress)
========================================================================
r2841 | jkrauska | 2006-06-28 23:54:49 -0700 (Wed, 28 Jun 2006) | 4 lines
Changed paths:
M /branch/throttle_01/apt/control
M /branch/throttle_01/base/control
M /branch/throttle_01/vyatta/control
Uprevving control file versions.
(just incase no one makes a commit on thursday)
No BUGID, just a packaging function.
========================================================================
r2873 | marat | 2006-06-30 17:00:28 -0700 (Fri, 30 Jun 2006) | 1 line
Changed paths:
M /branch/throttle_01/vyatta/xorp/rl_xg/html/index.html
Bug 1098 fix for throttle_01 branch.
========================================================================
r2894 | jkrauska | 2006-07-05 18:43:09 -0700 (Wed, 05 Jul 2006) | 3 lines
Changed paths:
M /branch/throttle_01/livecd/Makefile
Changing version label to 1.0RC1
(as instructed to, since this was REAL hard to change.)
========================================================================
Modified:
build/apt/control http://suva.vyatta.com/viewvc/build/apt/control
build/base/control http://suva.vyatta.com/viewvc/build/base/control
build/base/inittab http://suva.vyatta.com/viewvc/build/base/inittab
build/vyatta/config.boot.default http://suva.vyatta.com/viewvc/build/vyatta/config.boot.default
build/vyatta/control http://suva.vyatta.com/viewvc/build/vyatta/control
build/vyatta/xorp/etc/templates/package.cmds http://suva.vyatta.com/viewvc/build/vyatta/xorp/etc/templates/package.cmds
build/vyatta/xorp/etc/templates/rib.cmds http://suva.vyatta.com/viewvc/build/vyatta/xorp/etc/templates/rib.cmds
build/vyatta/xorp/libxipc/routelogics.hh http://suva.vyatta.com/viewvc/build/vyatta/xorp/libxipc/routelogics.hh
build/vyatta/xorp/libxipc/vrrp_set.cc http://suva.vyatta.com/viewvc/build/vyatta/xorp/libxipc/vrrp_set.cc
build/vyatta/xorp/rl_system/rl_system_node.cc http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_system/rl_system_node.cc
build/vyatta/xorp/rl_system/rl_system_node.hh http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_system/rl_system_node.hh
build/vyatta/xorp/rl_system/xrl_rl_system_node.cc http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_system/xrl_rl_system_node.cc
build/vyatta/xorp/rl_system/xrl_rl_system_node.hh http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_system/xrl_rl_system_node.hh
build/vyatta/xorp/rl_system/xrl_rl_system_shell_funcs.sh http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_system/xrl_rl_system_shell_funcs.sh
build/vyatta/xorp/rl_xg/html/index.html http://suva.vyatta.com/viewvc/build/vyatta/xorp/rl_xg/html/index.html
build/vyatta/xorp/xrl/interfaces/rl_system.xif http://suva.vyatta.com/viewvc/build/vyatta/xorp/xrl/interfaces/rl_system.xif
More information about the svn
mailing list