upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-17 16:58:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixup merge conflict

Browse source
This commit is contained in:
Mark Andrews 2012-06-01 21:10:57 +10:00
parent 9ab672f69e
commit d4b59ed307
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -4,14 +4,10 @@
they fail to validate, we try again in lower case.
[RT #27451]
<<<<<<< HEAD
--- 9.6-ESV-R7 released ---
=======
3328. [bug] Fixed inconsistent data checking in dst_parse.c.
[RT #29401]
--- 9.7.6 released ---
>>>>>>> fdfd260... fix check_data() usage
--- 9.6-ESV-R7 released ---
3318. [tuning] Reduce the amount of work performed while holding a
bucket lock when finshed with a fetch context.