LICENSE | 2
README | 14
RELNOTES | 14
client/dhclient-script.8 | 2
client/dhclient.8 | 2
client/dhclient.c | 4
client/dhclient.conf.5 | 2
client/dhclient.leases.5 | 4
client/scripts/freebsd | 2
client/scripts/macos | 2
common/dhcp-eval.5 | 2
common/dhcp-options.5 | 2
common/heap.c | 2
configure | 20
configure.ac | 2
contrib/3.0b1-lease-convert | 4
debian/changelog | 6
dhcpctl/dhcpctl.3 | 2
dhcpctl/dhcpctl.h | 2
dhcpctl/omshell.1 | 2
doc/References.xml | 2
doc/ja_JP.eucJP/dhclient-script.8 | 2
doc/ja_JP.eucJP/dhclient.8 | 2
doc/ja_JP.eucJP/dhclient.conf.5 | 2
doc/ja_JP.eucJP/dhclient.leases.5 | 2
doc/ja_JP.eucJP/dhcp-eval.5 | 2
doc/ja_JP.eucJP/dhcp-options.5 | 1384 +++++++++++++++++++-------------------
dst/base64.c | 2
dst/dst_api.c | 2
dst/dst_support.c | 2
dst/hmac_link.c | 2
dst/prandom.c | 2
includes/arpa/nameser.h | 2
includes/arpa/nameser_compat.h | 2
includes/heap.h | 2
includes/isc-dhcp/commandline.h | 2
includes/isc-dhcp/formatcheck.h | 2
includes/isc-dhcp/mem.h | 2
includes/isc-dhcp/print.h | 2
includes/isc-dhcp/string.h | 2
includes/minires/res_update.h | 2
includes/minires/resolv.h | 2
includes/t_api.h | 2
minires/ns_date.c | 2
minires/ns_name.c | 2
minires/ns_parse.c | 2
minires/ns_samedomain.c | 2
minires/ns_sign.c | 2
minires/ns_verify.c | 2
minires/res_comp.c | 2
minires/res_findzonecut.c | 2
minires/res_init.c | 2
minires/res_mkquery.c | 2
minires/res_mkupdate.c | 2
minires/res_query.c | 2
minires/res_send.c | 2
minires/res_update.c | 2
omapip/iscprint.c | 4
relay/dhcrelay.8 | 2
relay/dhcrelay.c | 4
server/dhcpd.8 | 2
server/dhcpd.c | 4
server/dhcpd.conf.5 | 2
server/dhcpd.leases.5 | 2
server/mdb6.c | 19
tests/HOWTO-unit-test | 2
tests/t_api.c | 2
67 files changed, 810 insertions(+), 781 deletions(-)
New commits:
commit e8a501a11652f6b74367929f0dc30f6dd8ebb270
Author: Bob Gilligan <gilli...@vyatta.com>
Date: Fri Mar 25 02:06:03 2011 -0700
4.1.2+vyatta1+mendocino3
commit d0d30c0be9c1a47da522ba67d241a507d8c5c8c4
Author: Bob Gilligan <gilli...@vyatta.com>
Date: Fri Mar 25 01:43:11 2011 -0700
Merge branch 'upstream' into napa
Conflicts:
README
RELNOTES
client/dhclient-script.8
client/dhclient.8
client/dhclient.conf.5
client/dhclient.leases.5
common/dhcp-eval.5
common/dhcp-options.5
configure
configure.ac
doc/ja_JP.eucJP/dhcp-options.5
minires/ns_parse.c
minires/res_findzonecut.c
relay/dhcrelay.8
server/dhcpd.8
server/dhcpd.conf.5
server/mdb6.c
(cherry picked from commit b045e1e8084890c359b3ced8743353b981ba365a)
http://suva.vyatta.com/git/?p=vyatta-dhcp3.git;a=commitdiff;h=e8a501a11652f6b74367929f0dc30f6dd8ebb270
http://suva.vyatta.com/git/?p=vyatta-dhcp3.git;a=commitdiff;h=d0d30c0be9c1a47da522ba67d241a507d8c5c8c4
_______________________________________________
svn mailing list
svn@mailman.vyatta.com
http://mailman.vyatta.com/mailman/listinfo/svn
