diff options
| author | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-11 23:51:08 -0700 |
|---|---|---|
| committer | Avneesh Sachdev <avneesh@opensourcerouting.org> | 2012-04-11 23:51:08 -0700 |
| commit | 14d2bbaa3f4aa53152472694c29f336808e47313 (patch) | |
| tree | e39bdddef4ea53207dd8fb61e1fd6b54d8c7721d /solaris | |
| parent | 51d4ef832c1e58150325630e25c442866e5a6cf5 (diff) | |
| parent | e96b312150d8e376c1ef463793d1929eca3618d5 (diff) | |
Merge quagga mainline into the google ISIS code.
The steps were:
$ git checkout google-is-is
$ git merge quagga
$ git checkout google-is-is -- isisd
# Resolve conflicts in the following:
lib/md5.h
zebra/rt_netlink.c
zebra/zebra_rib.c
zebra/zserv.c
Note that the content in the isisd directory is left unchanged in the
merge. As a result, changes made to isisd as part of the following
commits on the quagga mainline are dropped.
# 8ced4e82 is the merge base, e96b3121 is the current quagga master
$ git log --oneline --reverse 8ced4e82..e96b3121 -- isisd
5574999 isisd: fix crash on "no router isis" (BZ#536)
8998075 isisd: raise hello rate for DIS (BZ#539)
306ca83 isisd: include hash.h, not hash.c
b82cdeb delete CVS keywords
2f65867 isisd: indent longopts array
b511468 quagga: option "-z" ("--socket <path>") added
05e54ee build: delete .cvsignore files
b4e45f6 fix zebra protocol after MP-BGP changes
7fd6cd8 isisd: fix circuit state machine
907fd95 isisd: send proper LSP after DIS election
d034aa0 isisd: fix wrong next-hops from SPF
c25eaff isisd: unexpected kernel routing table (BZ#544)
e6b03b7 isisd: implement MD5 circuit authentication
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/.cvsignore | 14 | ||||
| -rw-r--r-- | solaris/Makefile.am | 1 | ||||
| -rwxr-xr-x | solaris/quagga.init.in | 2 |
3 files changed, 0 insertions, 17 deletions
diff --git a/solaris/.cvsignore b/solaris/.cvsignore deleted file mode 100644 index 810874ca..00000000 --- a/solaris/.cvsignore +++ /dev/null @@ -1,14 +0,0 @@ -Makefile -Makefile.in -?.manifest -*.xml -pkginfo.*.full -pkginfo.tmpl -prototype.daemons -prototype.dev -prototype.doc -prototype.libs -prototype.smf -quagga.init -*.pkg -*.pkg.gz diff --git a/solaris/Makefile.am b/solaris/Makefile.am index ecaf9b9b..dcee240c 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -1,5 +1,4 @@ # Solaris packages automake file -# $Id$ # XXX This file uses GNU make extensions. diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in index 8457e990..00426241 100755 --- a/solaris/quagga.init.in +++ b/solaris/quagga.init.in @@ -20,8 +20,6 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # -# $Id$ -# # Starts/stops the given daemon SMFINCLUDE=/lib/svc/share/smf_include.sh |