]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'trac3421' ('host' removed from examples)
authorTomek Mrugalski <tomasz@isc.org>
Tue, 19 Aug 2014 18:34:41 +0000 (20:34 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Tue, 19 Aug 2014 18:34:41 +0000 (20:34 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog

diff --cc ChangeLog
index b052e7b845756acd480aad1b4d2ba8ec0a58ec5c,431ecee041698f0eed39fc7b15814b4ba478f54e..48c783d28504a2f326d26f00899805e7d11c405d
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,11 @@@
 -8xx.  [build]         tomek
++822.  [build]         tomek
+       'host' program was removed from examples.
 -      (Trac #3421, git tbd)
++      (Trac #3421, git aeea893fb1c52d20258929a62a59ae2e7bd12e3d)
++
 +821.  [bug]           marcin
 +      DHCP servers no longer log an error when Interface Manager fails to
 +      receive a packet as a result of signal being received.
 +      (Trac #3478, git d80c83aef8e103dd483234429d35aeb66149e0b9)
  
  820.  [bug]           marcin
        Corrected the IfaceMgrTest.detectIfaces unit test which reported