[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 e756cec64438d80f039d5f08beddfd5ac13bc967
Merge: 43b65a3 7911863
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat May 24 17:53:31 2014 -0400

    Merge branch 'upstream'

 LICENSE                        |   5 +-
 README                         |  31 +++-
 RELNOTES                       |  74 ++++++++--
 bind/bind.tar.gz               | Bin 7732025 -> 7739733 bytes
 bind/version.tmp               |   4 +-
 client/clparse.c               |   8 +-
 client/dhclient-script.8       |  12 +-
 client/dhclient.8              |   9 +-
 client/dhclient.c              |   4 +-
 client/dhclient.conf.5         |   8 +-
 client/dhclient.leases.5       |   6 -
 common/alloc.c                 |   8 +-
 common/bpf.c                   |  97 ++++++------
 common/comapi.c                |   8 +-
 common/conflex.c               |   8 +-
 common/ctrace.c                |   6 +-
 common/dhcp-eval.5             |   8 +-
 common/dhcp-options.5          | 326 +++++++++++++++++++++++++++++++++++++++--
 common/discover.c              |   8 +-
 common/dns.c                   |   5 +-
 common/ethernet.c              |   8 +-
 common/execute.c               |   8 +-
 common/fddi.c                  |   8 +-
 common/icmp.c                  |   8 +-
 common/inet.c                  |   8 +-
 common/memory.c                |   8 +-
 common/nit.c                   |   8 +-
 common/options.c               |   8 +-
 common/parse.c                 |   8 +-
 common/print.c                 |   8 +-
 common/raw.c                   |   8 +-
 common/resolv.c                |   8 +-
 common/socket.c                |   8 +-
 common/tables.c                | 117 ++++++++++++---
 common/tree.c                  |  88 +++++------
 common/upf.c                   |   8 +-
 configure.ac                   |   2 +-
 dhcpctl/callback.c             |   8 +-
 dhcpctl/dhcpctl.3              |   8 +-
 dhcpctl/dhcpctl.c              |   8 +-
 dhcpctl/dhcpctl.h              |   8 +-
 dhcpctl/omshell.1              |  23 +--
 dhcpctl/omshell.c              |   8 +-
 dhcpctl/remote.c               |   8 +-
 includes/arpa/nameser.h        |   6 +-
 includes/arpa/nameser_compat.h |   6 +-
 includes/ctrace.h              |   6 +-
 includes/dhcp.h                |   6 +-
 includes/dhcpd.h               |   8 +-
 includes/dhctoken.h            |   8 +-
 includes/failover.h            |   8 +-
 includes/inet.h                |   8 +-
 includes/netinet/if_ether.h    |   6 +-
 includes/netinet/ip.h          |   6 +-
 includes/netinet/ip_icmp.h     |   6 +-
 includes/netinet/udp.h         |   6 +-
 includes/omapip/alloc.h        |   8 +-
 includes/omapip/buffer.h       |   8 +-
 includes/omapip/convert.h      |   8 +-
 includes/omapip/hash.h         |   8 +-
 includes/omapip/omapip.h       |   8 +-
 includes/omapip/omapip_p.h     |   8 +-
 includes/omapip/trace.h        |   6 +-
 includes/osdep.h               |  10 +-
 includes/site.h                |  23 +++
 includes/statement.h           |   8 +-
 includes/tree.h                |   8 +-
 omapip/alloc.c                 |   8 +-
 omapip/array.c                 |   8 +-
 omapip/auth.c                  |   8 +-
 omapip/buffer.c                |   8 +-
 omapip/connection.c            |   8 +-
 omapip/convert.c               |   8 +-
 omapip/dispatch.c              |   8 +-
 omapip/errwarn.c               |  25 +---
 omapip/generic.c               |   8 +-
 omapip/handle.c                |   8 +-
 omapip/hash.c                  |   8 +-
 omapip/inet_addr.c             |   6 +-
 omapip/isclib.c                |   4 +-
 omapip/listener.c              |   8 +-
 omapip/message.c               |   8 +-
 omapip/omapi.3                 |   8 +-
 omapip/protocol.c              |   8 +-
 omapip/support.c               |   8 +-
 omapip/test.c                  |   8 +-
 omapip/toisc.c                 |   8 +-
 omapip/trace.c                 |   6 +-
 relay/dhcrelay.c               |  10 +-
 server/bootp.c                 |   8 +-
 server/class.c                 |   8 +-
 server/confpars.c              |  10 +-
 server/db.c                    |   8 +-
 server/ddns.c                  |   4 +-
 server/dhcp.c                  |   8 +-
 server/dhcpd.c                 |  10 +-
 server/dhcpd.conf.5            |  10 +-
 server/dhcpd.leases.5          |  13 +-
 server/failover.c              |   8 +-
 server/ldap.c                  |   2 +-
 server/mdb.c                   |   8 +-
 server/omapi.c                 |   8 +-
 server/salloc.c                |   8 +-
 server/stables.c               |   8 +-
 104 files changed, 743 insertions(+), 773 deletions(-)

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