diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2008-04-27 19:05:04 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2008-04-27 19:05:04 -0700 |
| commit | da2f87025f22db0e357b5437ae7d4baf57717fbd (patch) | |
| tree | 122b24b73b6d25560ba83b4834ccf61142d98f09 /NEWS | |
| parent | 492a1b10e5921d3814eb9ef9a741899ffb6f0a6c (diff) | |
| parent | 3cc5d784f43768b983ef7429a78a9e244beea613 (diff) | |
| download | vyatta-cfg-quagga-da2f87025f22db0e357b5437ae7d4baf57717fbd.tar.gz vyatta-cfg-quagga-da2f87025f22db0e357b5437ae7d4baf57717fbd.zip | |
Merge commit 'origin/glendale' into hollywood
Conflicts:
templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
Diffstat (limited to 'NEWS')
0 files changed, 0 insertions, 0 deletions