src/contrib/bind, branch main FreeBSD source tree https://cgit-dev.freebsd.org/src/atom?h=main 2004-09-24T19:48:50Z Retire the BIND 8 sources. 2004-09-24T19:48:50Z Dag-Erling Smørgrav des@FreeBSD.org 2004-09-24T19:48:50Z urn:sha1:29d75632bd276029d874c42e613218086eebd6dd Apply the vendor change to this file, thus resolving the import conflict 2003-11-28T22:02:17Z Doug Barton dougb@FreeBSD.org 2003-11-28T22:02:17Z urn:sha1:892eacbb1002c64bc7e0e20599a71e2387cba9e7 This commit was generated by cvs2svn to compensate for changes in r123036, 2003-11-28T21:58:43Z Doug Barton dougb@FreeBSD.org 2003-11-28T21:58:43Z urn:sha1:407774b7a8bb35223ece423729212b132a0f8cb0 which included commits to RCS files with non-trunk default branches. Import of ISC BIND version 8.3.7 2003-11-28T21:58:43Z Doug Barton dougb@FreeBSD.org 2003-11-28T21:58:43Z urn:sha1:0509c045a7e11490d63b2eb99152d00b3ecface8 Approved by: re Requested by: security-officer Give an example of the more efficient conflict resolution command 2003-06-17T09:20:16Z Doug Barton dougb@FreeBSD.org 2003-06-17T09:20:16Z urn:sha1:e44548554b9475ac61485326f9d2966c8dfcc0af suggested by the version of the commit message that's mailed out as opposed to the more error prone version that will be suggested when doing the actual import. Resolve conflicts in 8.3.6, generally in favor of the vendor code 2003-06-17T08:32:40Z Doug Barton dougb@FreeBSD.org 2003-06-17T08:32:40Z urn:sha1:3329c8935f18e4cb4ef84fc963d27118331e0986 Import of ISC BIND version 8.3.6. 2003-06-17T08:25:13Z Doug Barton dougb@FreeBSD.org 2003-06-17T08:25:13Z urn:sha1:55d70290491b0c3113f72d2be4106edafc59e5fd Version 8.3.5 was skipped due to bugs fixed in this version. This commit was generated by cvs2svn to compensate for changes in r116464, 2003-06-17T08:25:13Z Doug Barton dougb@FreeBSD.org 2003-06-17T08:25:13Z urn:sha1:5d217625ac9c1a951a27921fa39ad3b8fef197ef which included commits to RCS files with non-trunk default branches. Import of ISC BIND version 8.3.4 2003-01-28T13:09:17Z Doug Barton dougb@FreeBSD.org 2003-01-28T13:09:17Z urn:sha1:7f1ab065ebdc6d98a8f6338d1fb90e53d035e034 This commit was generated by cvs2svn to compensate for changes in r109983, 2003-01-28T13:09:17Z Doug Barton dougb@FreeBSD.org 2003-01-28T13:09:17Z urn:sha1:68ec16bb1ea7da7dce3bf6923e9c6a90a1bb12f9 which included commits to RCS files with non-trunk default branches.