summaryrefslogtreecommitdiff
path: root/templates/protocols/ospf
diff options
context:
space:
mode:
authorMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:47 -0700
committerMark O'Brien <mobrien@vyatta.com>2008-03-19 18:38:47 -0700
commit727fa16487600bc36d7f394fdeadb9dc78214d27 (patch)
tree679d1845223dfcf6e301b2f23d7edfd320140d61 /templates/protocols/ospf
parent69a86cbb04a11c41365b6001c8818663cbea05d8 (diff)
parent6315c678a346c411d6ee14536f9d05563b1945eb (diff)
downloadvyatta-cfg-quagga-727fa16487600bc36d7f394fdeadb9dc78214d27.tar.gz
vyatta-cfg-quagga-727fa16487600bc36d7f394fdeadb9dc78214d27.zip
Merge branch 'glendale' of git:/git/vyatta-cfg-quagga into glendale
Conflicts: debian/changelog
Diffstat (limited to 'templates/protocols/ospf')
0 files changed, 0 insertions, 0 deletions