diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:23:09 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:23:09 -0700 |
| commit | 894a73759de66ea411824bbdaf99d07b8eeb2faf (patch) | |
| tree | 67f6fda887ec5f881bbfdfe4b72f2422199a6ecc /templates/system/options | |
| parent | 919ac0e4a35509f32fc6eaf6b0c5dac686b3b5db (diff) | |
| parent | 4c42c6bde357423f0704a6e5b1ea70081944a1bb (diff) | |
| download | vyatta-cfg-quagga-894a73759de66ea411824bbdaf99d07b8eeb2faf.tar.gz vyatta-cfg-quagga-894a73759de66ea411824bbdaf99d07b8eeb2faf.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/interfaces/bridge/node.def
templates/interfaces/ethernet/node.tag/bridge-group/node.def
Diffstat (limited to 'templates/system/options')
0 files changed, 0 insertions, 0 deletions