[pkg-dhcp-commits] [isc-dhcp] 06/09: 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 7df628fda45413d131367e404b88ae94ab97a9b0
Merge: baf8a24 35c16ad
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 5 19:20:19 2015 +0000

    Merge branch 'upstream'

 Makefile.am                     |    4 +-
 README                          |   23 +-
 RELNOTES                        |  194 ++++-
 client/dhc6.c                   |   16 +-
 client/dhclient.8               |   27 +-
 client/dhclient.c               |   46 +-
 common/conflex.c                |   28 +-
 common/dhcp-eval.5              |   17 +-
 common/dhcp-options.5           |   25 +-
 common/dns.c                    |    2 +-
 common/execute.c                |   18 +-
 common/lpf.c                    |   17 +-
 common/options.c                |   95 ++-
 common/parse.c                  |   32 +-
 configure.ac                    |  105 ++-
 contrib/ldap/README.ldap        |   41 +
 contrib/ldap/dhcp.schema        |   28 +-
 contrib/ldap/dhcpd-conf-to-ldap |   84 +-
 doc/devel/atf.dox               |  101 ++-
 dst/Makefile.am                 |    8 -
 dst/base64.c                    |  322 --------
 dst/dst_api.c                   | 1108 -------------------------
 dst/dst_internal.h              |  171 ----
 dst/dst_support.c               |  470 -----------
 dst/hmac_link.c                 |  503 ------------
 dst/md5.h                       |  123 ---
 dst/md5_dgst.c                  |  396 ---------
 dst/md5_locl.h                  |  211 -----
 dst/prandom.c                   |  976 ----------------------
 includes/Makefile.am            |    1 +
 includes/config.h.in            |   15 +
 includes/dhcpd.h                |  115 ++-
 includes/dhctoken.h             |    5 +-
 includes/ldap_casa.h            |  102 +++
 includes/ldap_krb_helper.h      |   49 ++
 includes/site.h                 |    3 +
 includes/statement.h            |    6 +-
 server/Makefile.am              |    5 +-
 server/class.c                  |   57 +-
 server/confpars.c               |   78 +-
 server/db.c                     |   21 +-
 server/ddns.c                   |    3 +-
 server/dhcp.c                   |  130 +--
 server/dhcpd.8                  |   71 +-
 server/dhcpd.c                  |   46 +-
 server/dhcpd.conf.5             |  103 ++-
 server/dhcpv6.c                 |  882 ++++++++++++++------
 server/failover.c               |   65 +-
 server/ldap.c                   | 1692 ++++++++++++++++++++++++++++++++-------
 server/ldap_casa.c              |    4 +-
 server/ldap_krb_helper.c        |  217 +++++
 server/leasechain.c             |  695 ++++++++++++++++
 server/mdb.c                    |  333 +++++---
 server/omapi.c                  |   27 +-
 server/stables.c                |    5 +
 server/tests/Makefile.am        |    7 +-
 server/tests/leaseq_unittest.c  |  503 ++++++++++++
 util/bindvar.sh                 |    2 +-
 58 files changed, 5201 insertions(+), 5232 deletions(-)

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