[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 master
in repository isc-dhcp.

commit e1432ab1932f9e5a0427ce0685e6cf7fba2c7a30
Merge: e613300 5fc8748
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Sep 11 22:57:51 2016 +0000

    Merge branch 'upstream'

 README                            |  10 +-
 RELNOTES                          |  97 ++++++++++++-
 client/dhclient-script.8          |  10 +-
 client/dhclient.8                 |   2 +-
 client/dhclient.conf.5            |  11 +-
 client/dhclient.conf.example      |   4 +-
 client/tests/Makefile.am          |  12 +-
 common/discover.c                 |  24 ++--
 common/execute.c                  |   6 +-
 common/options.c                  | 278 +++++++++++++++++++++++++-------------
 common/tables.c                   |  10 +-
 common/tests/Makefile.am          |   4 +-
 common/tests/test_alloc.c         |  92 +++++++++++++
 common/tree.c                     |   2 +-
 configure.ac                      |   5 +-
 contrib/dhcp-lease-list.pl        |  40 ++++--
 contrib/ldap/dhcp.schema          |   2 +-
 doc/DHCPv4-over-DHCPv6            |   6 +-
 doc/ja_JP.eucJP/dhclient-script.8 |   9 +-
 doc/ja_JP.eucJP/dhclient.conf.5   |  15 +-
 doc/ja_JP.eucJP/dhclient.leases.5 |   9 +-
 doc/ja_JP.eucJP/dhcp-eval.5       |   8 +-
 doc/ja_JP.eucJP/dhcp-options.5    |   9 +-
 includes/dhcpd.h                  |   6 +
 includes/omapip/omapip.h          |   4 +-
 omapip/alloc.c                    |   6 +-
 omapip/connection.c               |   4 +-
 relay/dhcrelay.8                  |  35 ++++-
 relay/dhcrelay.c                  |  99 +++++++++++---
 server/confpars.c                 |   6 +-
 server/ddns.c                     |  85 ++++++++----
 server/dhcp.c                     |  42 +++++-
 server/dhcpd.8                    |   8 +-
 server/dhcpd.c                    |  15 ++
 server/dhcpd.conf.5               |  60 ++++++--
 server/dhcpd.conf.example         |   4 +-
 server/failover.c                 |  47 +++++++
 server/ldap.c                     |   8 +-
 server/mdb.c                      |  40 ++++--
 server/stables.c                  |   1 +
 server/tests/Makefile.am          |   4 +-
 tests/failover/dhcp-1.cf          |   4 +-
 tests/failover/dhcp-2.cf          |   4 +-
 43 files changed, 847 insertions(+), 300 deletions(-)

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