diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-01-13 15:24:25 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-01-13 15:24:25 +0100 |
| commit | b6f1faf04596242329d8ecd95b732f1d396e7823 (patch) | |
| tree | 901c5d924c7b77ba7a7ac561c060e223a3e5f8cd /lib/json.c | |
| parent | 496e83a5d761220bfe9b31e66fe513ccf05e0a6a (diff) | |
| parent | 6f3b38578810977af89bdd7903b4c5e6146f9cbe (diff) | |
Merge branch 'stable/2.0-for-merge'
Conflicts (CLI vs. atol()):
- bgpd/bgp_vty.c
- ospfd/ospf_vty.c
- zebra/zebra_vty.c
NB: pull req #65 (LabNConsulting/working/2.0/afi-safi-vty/c) was
excluded from this merge.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/json.c')
0 files changed, 0 insertions, 0 deletions