[pkg-dhcp-commits] [isc-dhcp] 02/11: 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 d09b9544c52898d0446331f9cf3c8f0f44e43c07
Merge: ee801dc d45c7a3
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun May 10 23:45:14 2015 +0000

    Merge branch 'upstream'

 LICENSE                     |   2 +-
 README                      |  10 +-
 RELNOTES                    | 334 +++++++++++++++++++++++----
 bind/Makefile               |  89 --------
 bind/bind.tar.gz            | Bin 7740063 -> 0 bytes
 bind/version.tmp            |  13 --
 client/dhc6.c               |   8 +-
 client/dhclient.c           |   4 +-
 client/tests/Makefile.am    |   9 +-
 common/alloc.c              |  64 ++++++
 common/bpf.c                |   4 +-
 common/conflex.c            |   2 +-
 common/dhcp-options.5       |   2 +-
 common/discover.c           |   6 +-
 common/dlpi.c               |   4 +-
 common/lpf.c                | 111 +++++++--
 common/nit.c                |   2 +-
 common/ns_name.c            | 142 ++++++++++++
 common/options.c            |  70 +++++-
 common/packet.c             |  96 ++++----
 common/parse.c              |  60 +++--
 common/socket.c             |  24 +-
 common/tests/Makefile.am    |  10 +-
 common/tests/ns_name_test.c | 160 +++++++++++++
 common/tests/test_alloc.c   | 104 ++++++++-
 common/tree.c               | 244 +++++++++++++++++---
 common/upf.c                |   2 +-
 configure.ac                |  44 +++-
 dhcpctl/dhcpctl.c           |   1 +
 doc/devel/atf.dox           |  26 ++-
 dst/dst_api.c               |  60 ++---
 dst/dst_support.c           |  39 ++--
 dst/prandom.c               |   3 +-
 includes/config.h.in        |   6 +
 includes/dhcpd.h            |  71 ++++--
 includes/failover.h         |   2 +
 includes/minires.h          |   3 +
 includes/omapip/isclib.h    |   7 +-
 includes/omapip/result.h    |   5 +-
 includes/site.h             |  37 +--
 includes/tree.h             |   3 +-
 omapip/isclib.c             |  37 ++-
 omapip/test.c               |   7 +-
 omapip/trace.c              |   6 +-
 relay/dhcrelay.c            |  21 +-
 server/bootp.c              |  57 +++--
 server/confpars.c           | 103 ++++++++-
 server/db.c                 |   2 +-
 server/ddns.c               |  30 ++-
 server/dhcp.c               | 532 +++++++++++++++++++++++++++++++-------------
 server/dhcpd.c              | 125 +++++++----
 server/dhcpd.conf.5         | 243 ++++++++++++++++++--
 server/dhcpd.leases.5       |  22 +-
 server/dhcpv6.c             | 318 ++++++++++++++++++++------
 server/failover.c           | 232 ++++++++++++-------
 server/mdb.c                |  93 +++++---
 server/mdb6.c               | 103 ++++++++-
 server/omapi.c              |  23 +-
 server/stables.c            |  20 +-
 server/tests/Makefile.am    |  10 +-
 tests/HOWTO-unit-test       |  48 +++-
 tests/unittest.sh.in        |  79 +++++++
 62 files changed, 3042 insertions(+), 952 deletions(-)

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