From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 29 Dec 2011 22:26:40 +0000 (+0100)
Subject: Merge branch 'trac1230'
X-Git-Tag: trac2351_base~310^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be309bf010ba993fb13e79bb4ce8802d8dacf0a4;p=thirdparty%2Fkea.git

Merge branch 'trac1230'

Conflicts:
	ChangeLog
	src/lib/dhcp/iface_mgr.h
---

be309bf010ba993fb13e79bb4ce8802d8dacf0a4
diff --cc ChangeLog
index ff15bf746b,3f64bba193..0892d4c3aa
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,9 +1,9 @@@
+ 363.	[func]		tomek
+ 	dhcp4: Support for DISCOVER and OFFER implemented. b10-dhcp4 is
+ 	now able to offer hardcoded leases to DHCPv4 clients.
+ 	dhcp6: Code refactored to use the same approach as dhcp4.
 -	(Trac #1230, git TBD)
++	(Trac #1230, git aac05f566c49daad4d3de35550cfaff31c124513)
+ 
  362.	[func]		tomek
  	libdhcp++: Interface detection in Linux implemented. libdhcp++
  	if now able to detect available network interfaces, its link-layer