[pkg-dhcp-commits] [isc-dhcp] 02/04: Merge branch 'upstream'

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch experimental
in repository isc-dhcp.

commit eeba2939a1b4e166fcc5f10c3b54804c3c73907d
Merge: ba1da0c ace6381
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Mar 26 01:55:07 2016 +0000

    Merge branch 'upstream'

 LICENSE                          |    2 +-
 Makefile.am                      |   14 +-
 README                           |   14 +-
 RELNOTES                         |  215 +++++-
 client/Makefile.am               |   17 +-
 client/clparse.c                 |  109 ++-
 client/dhc6.c                    |  913 ++++++++++++++++++++-----
 client/dhclient.8                |   30 +-
 client/dhclient.c                |  938 +++++++++++++++++++++++--
 client/dhclient.conf.5           |   75 +-
 client/tests/Makefile.am         |   23 +-
 common/Makefile.am               |   12 +-
 common/alloc.c                   |   67 +-
 common/bpf.c                     |    7 +-
 common/comapi.c                  |   15 +-
 common/conflex.c                 |   19 +-
 common/ctrace.c                  |    7 +
 common/dhcp-options.5            |    4 +-
 common/dhcp4o6.c                 |  116 ++++
 common/discover.c                |   50 +-
 common/dlpi.c                    |   15 +-
 common/execute.c                 |   26 +-
 common/inet.c                    |   30 +-
 common/lpf.c                     |    6 +-
 common/options.c                 |   30 +-
 common/packet.c                  |   49 +-
 common/print.c                   |  101 ++-
 common/tables.c                  |   59 +-
 common/tests/Makefile.am         |   26 +-
 common/tests/test_alloc.c        |   56 +-
 common/tree.c                    |   19 +-
 configure.ac                     |  187 ++++-
 contrib/dhcp-lease-list.pl       |    7 +-
 dhcpctl/Makefile.am              |   10 +-
 dhcpctl/omshell.c                |   17 +-
 doc/DHCPv4-over-DHCPv6           |  221 ++++++
 includes/config.h.in             |    8 +-
 includes/dhcp6.h                 |   76 +-
 includes/dhcpd.h                 |   67 +-
 includes/dhctoken.h              |   11 +-
 includes/omapip/omapip_p.h       |    3 +-
 includes/osdep.h                 |    4 +-
 includes/site.h                  |   33 +-
 omapip/Makefile.am               |    6 +-
 omapip/hash.c                    |    5 +-
 omapip/listener.c                |   10 +-
 relay/Makefile.am                |    6 +-
 relay/dhcrelay.8                 |   39 +-
 relay/dhcrelay.c                 |  182 ++++-
 server/Makefile.am               |    8 +-
 server/bootp.c                   |   31 +-
 server/confpars.c                |  337 ++++++---
 server/db.c                      |   49 +-
 server/dhcp.c                    |  394 ++++++++++-
 server/dhcpd.8                   |   17 +-
 server/dhcpd.c                   |  185 +++--
 server/dhcpd.conf.5              |   77 ++-
 server/dhcpd.leases.5            |   26 +-
 server/dhcpleasequery.c          |    8 +-
 server/dhcpv6.c                  | 1407 ++++++++++++++++++++++++++++++--------
 server/failover.c                |   17 +-
 server/ldap.c                    |    4 +
 server/leasechain.c              |    5 +-
 server/mdb.c                     |   34 +-
 server/mdb6.c                    |  219 +++++-
 server/omapi.c                   |  138 +++-
 server/salloc.c                  |   16 +-
 server/stables.c                 |    5 +-
 server/tests/Makefile.am         |   20 +-
 server/tests/load_bal_unittest.c |   11 +-
 server/tests/simple_unittest.c   |   52 +-
 util/bindvar.sh                  |   13 +-
 72 files changed, 5919 insertions(+), 1110 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git