tree 62dd60ba70aab5f31490e64c980371a4e1baaa48
parent 7397217e9dbc7384951ea146c0f9ca5784f6561e
parent 7d924b422ffdeb37027ac979c6a62d845499fab8
author David Lamparter <equinox@opensourcerouting.org> 1423029674 +0100
committer David Lamparter <equinox@opensourcerouting.org> 1423256918 +0100

pimd: merge pimd as of 2015-01-19

Welcome pimd to the Quagga daemon zoo!

This is a merge of commit 77ae369 ("pimd: Log ifindex found for an
interface when zebra lib reports a new connected address."), with
the intermediate "reconnect" changes removed (c9adf00...d274381).
d274381 is replaced with b162ab7, which includes some changes.  In
addition, 4 reconnect-related changes and 1 cosmetic one have been
bumped out.

The rebase command used to produce the branch that is merged here is:
  git rebase --onto b162ab7 c9adf00 77ae369

Note that 3 patches had their author rewritten from
    "Anonymous SR#108542 <>" (which is not a valid git author ID)
to: "Savannah SR#108542 <nbahr@atcorp.com>" (which is the e-mail address
                               listed in the associated Savannah ticket)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>