[pkg-dhcp-commits] [isc-dhcp] 02/08: Merge branch 'upstream' into experimental

[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 6049a88c5907acb8d815fa4322a2dbf6bc4dcb6e
Merge: 8a2a11c ba71266
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Jul 19 21:59:04 2014 +0000

    Merge branch 'upstream' into experimental

 README                         |   12 +-
 RELNOTES                       | 1082 ++++++++++++++++++++++------------------
 bind/bind.tar.gz               |  Bin 7739733 -> 7740043 bytes
 bind/version.tmp               |    4 +-
 client/Makefile.am             |    6 +
 client/clparse.c               |   39 ++
 client/dhc6.c                  |   31 +-
 client/dhclient.8              |   14 +
 client/dhclient.c              |  173 +++++--
 client/tests/Atffile           |    5 +
 client/tests/Makefile.am       |   40 ++
 client/tests/duid0_test.txt    |   33 ++
 client/tests/duid1_test.txt    |    3 +
 client/tests/duid2_test.txt    |   66 +++
 client/tests/duid3_test.txt    |   66 +++
 client/tests/duid_unittest.c   |  136 +++++
 common/bpf.c                   |    3 +
 common/conflex.c               |    3 +
 common/dhcp-eval.5             |   73 ++-
 common/dhcp-options.5          |   29 +-
 common/discover.c              |    9 +-
 common/ns_name.c               |    6 +-
 common/options.c               |   58 ++-
 common/parse.c                 |   44 +-
 common/socket.c                |    1 -
 common/tests/Makefile.am       |    8 +-
 common/tests/dns_unittest.c    |   18 +
 common/tests/misc_unittest.c   |  166 ++++++
 configure.ac                   |   13 +-
 dhcpctl/omshell.c              |    2 +-
 doc/examples/dhcpd-dhcpv6.conf |    3 +-
 dst/base64.c                   |    6 +-
 dst/dst_api.c                  |   30 +-
 dst/dst_support.c              |    5 +-
 dst/hmac_link.c                |   10 +-
 dst/prandom.c                  |    9 +-
 includes/config.h.in           |    3 +
 includes/dhcpd.h               |   31 ++
 includes/omapip/omapip_p.h     |    1 -
 includes/site.h                |   31 +-
 omapip/errwarn.c               |    9 +-
 omapip/isclib.c                |   24 +-
 relay/dhcrelay.c               |    9 +-
 server/confpars.c              |   10 +-
 server/dhcp.c                  |  102 +++-
 server/dhcpd.c                 |   56 ++-
 server/dhcpd.conf.5            |   39 +-
 server/dhcpd.leases.5          |  239 ++++++---
 server/dhcpv6.c                |  206 +++++---
 server/failover.c              |    3 +
 server/mdb6.c                  |   14 +-
 server/stables.c               |    2 +
 52 files changed, 2163 insertions(+), 822 deletions(-)

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