diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-13 11:34:28 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-13 11:34:28 -0800 |
| commit | 9773974965c7b639a125b44be3728d00af48e929 (patch) | |
| tree | cec7818e22ee6ebc3a7613fc3081f67fb8cf0a7d /templates/protocols/bgp/node.def | |
| parent | 5db776a29c90d05f864645e7e171840660f4b268 (diff) | |
| parent | 0733bceb217bca1ceb094fb124b89c53cb7cdd25 (diff) | |
| download | vyatta-cfg-quagga-9773974965c7b639a125b44be3728d00af48e929.tar.gz vyatta-cfg-quagga-9773974965c7b639a125b44be3728d00af48e929.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-quagga into jenner
Conflicts:
scripts/vyatta-protocol
Diffstat (limited to 'templates/protocols/bgp/node.def')
0 files changed, 0 insertions, 0 deletions