diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-11 14:39:29 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-11 14:39:29 -0700 |
| commit | 11c599572e730c22198aa3d35cdc113b638ca4a8 (patch) | |
| tree | 05d062beb68b0a3dd5a50df622d354ac3fa28852 /templates/system/gateway-address/node.def | |
| parent | 17a6da10c0fcb87edcad978daa1f1462515cc011 (diff) | |
| parent | c999ddec2a30f23121072d51a49003fd822527d7 (diff) | |
| download | vyatta-cfg-quagga-11c599572e730c22198aa3d35cdc113b638ca4a8.tar.gz vyatta-cfg-quagga-11c599572e730c22198aa3d35cdc113b638ca4a8.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/protocols/ospf/area/node.tag/range/node.tag/cost/node.def
templates/protocols/ospf/area/node.tag/range/node.tag/not-advertise/node.def
templates/protocols/ospf/area/node.tag/range/node.tag/substitute/node.def
templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/md5/node.def
templates/protocols/ospf/area/node.tag/virtual-link/node.tag/authentication/plaintext-password/node.def
Diffstat (limited to 'templates/system/gateway-address/node.def')
0 files changed, 0 insertions, 0 deletions