]> git.puffer.fish Git - mirror/frr.git/commit
bgpd: Fix merge error in jhash commit
authorPaul Jakma <paul@quagga.net>
Tue, 29 Mar 2011 13:18:49 +0000 (14:18 +0100)
committerPaul Jakma <paul@quagga.net>
Tue, 29 Mar 2011 13:18:49 +0000 (14:18 +0100)
commit31d0f1b3c64903d56a47caebf887067d222c7cd6
tree7a7d90f0517bc2816fc0279f79b5d7a9ab195095
parentf5a4827db60545309d0ee378b85acac56cf7837a
bgpd: Fix merge error in jhash commit

* bgp_attr.c: (attrhash_key_make) 98e30f should have changed jhash2 to jhash.

  These kinds of merge errors would be reduced and life would be easier if
  people would submit fully-formed fixes that could be chucked directly into
  git-am.
bgpd/bgp_attr.c