diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-21 16:31:29 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-21 16:31:29 -0700 |
| commit | 8328b5607db0e3e8c7cc0cd2ad035475e3dc0887 (patch) | |
| tree | 680e7a90962bc3a627de58ad79db87af31e9aab4 /templates/protocols | |
| parent | b2fb9963d1b65ac4b32ada1742cd1ba24fa8c739 (diff) | |
| parent | 69b0e51b4a3afeb6cf1fb8893c3e705412d988b0 (diff) | |
| download | vyatta-cfg-quagga-8328b5607db0e3e8c7cc0cd2ad035475e3dc0887.tar.gz vyatta-cfg-quagga-8328b5607db0e3e8c7cc0cd2ad035475e3dc0887.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def
Diffstat (limited to 'templates/protocols')
0 files changed, 0 insertions, 0 deletions