diff options
author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
---|---|---|
committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-09 00:25:15 -0700 |
commit | 3cf6c2b4e43f44a977d218c96c26250654ae333e (patch) | |
tree | e017cde2015fbf3ef6c250327428d7c6152aa8f7 /watchquagga | |
parent | 01d7ff0a2166a422c56bd26f04fc22832a9e690b (diff) | |
parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) |
Merge branch 'quagga' into google-bgp-multipath
Conflicts:
bgpd/bgp_route.c
Diffstat (limited to 'watchquagga')
-rw-r--r-- | watchquagga/.cvsignore | 13 | ||||
-rw-r--r-- | watchquagga/watchquagga.c | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/watchquagga/.cvsignore b/watchquagga/.cvsignore deleted file mode 100644 index c661510b..00000000 --- a/watchquagga/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -Makefile -Makefile.in -*.o -watchquagga -tags -TAGS -.deps -.nfs* -*.lo -*.la -*.libs -.arch-inventory -.arch-ids diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c index fb628acc..b57fd3ae 100644 --- a/watchquagga/watchquagga.c +++ b/watchquagga/watchquagga.c @@ -1,6 +1,4 @@ /* - $Id$ - Monitor status of quagga daemons and restart if necessary. Copyright (C) 2004 Andrew J. Schorr |