Browse Source

[trac703] Merge branch 'master' into trac703

Conflicts:
	ChangeLog
Stephen Morris 14 years ago
parent
commit
1b666838b6
1 changed files with 6 additions and 1 deletions
  1. 6 1
      ChangeLog

+ 6 - 1
ChangeLog

@@ -1,8 +1,13 @@
-219.	[func]		stephen
+220.	[func]		stephen
 	Added the 'badpacket' program for testing; it sends a set of
 	Added the 'badpacket' program for testing; it sends a set of
 	(potentially) bad packets to a nameserver and prints the responses.
 	(potentially) bad packets to a nameserver and prints the responses.
 	(Trac #703, git 17106327efdf114e15b21cf8079f9191ab073648)
 	(Trac #703, git 17106327efdf114e15b21cf8079f9191ab073648)
 
 
+219.    [func]          ocean
+	src/lib: move some dns related code out of asiolink library to
+	asiodns library
+	(Trac #751, git 262ac6c6fc61224d54705ed4c700dadb606fcb1c)
+
 218.	[func]		jinmei
 218.	[func]		jinmei
 	src/lib/dns: added support for RP RDATA.
 	src/lib/dns: added support for RP RDATA.
 	(Trac #806, git 4e47d5f6b692c63c907af6681a75024450884a88)
 	(Trac #806, git 4e47d5f6b692c63c907af6681a75024450884a88)