BIND 10 #1600: Use UDPSyncServer for b10-auth
BIND 10 Development
do-not-reply at isc.org
Thu Mar 15 01:58:08 UTC 2012
#1600: Use UDPSyncServer for b10-auth
-------------------------------------+-------------------------------------
Reporter: | Owner: kevin_tes
jinmei | Status: closed
Type: task | Milestone:
Priority: | Sprint-20120320
medium | Resolution: fixed
Component: | Sensitive: 0
b10-auth | Sub-Project: DNS
Keywords: | Estimated Difficulty: 5
Defect Severity: N/A | Total Hours: 0
Feature Depending on Ticket: auth |
performance |
Add Hours to Ticket: 0 |
Internal?: 0 |
-------------------------------------+-------------------------------------
Comment (by kevin_tes):
Replying to [comment:32 jinmei]:
> Replying to [comment:31 kevin_tes]:
>
> It doesn't even compile.
>
> Please, at least make sure it builds successfully, especially when you
> see conflicts on merge:
>
> {{{
> +<<<<<<< HEAD
> +=======
> // Convenience method for tests that expect to return SERVFAIL
> // It calls processMessage, checks if there is an answer, and
> // check the header for default SERVFAIL data
> @@ -135,6 +137,7 @@ protected:
> opcode.getCode(), QR_FLAG, 1, 0, 0, 0);
> }
>
> +>>>>>>> master
> IOService ios_;
> DNSService dnss_;
> MockSession statistics_session;
> @@ -1075,6 +1078,29 @@ TEST_F(AuthSrvTest, listenAddresses) {
> "Released tokens");
> }
> }}}
jinmei,on my develop computer i have solve the conflict and it compiles
well. i am not sure why merged it gets the conflict, sorry for the misuse
of git. I'll fixed it.
--
Ticket URL: <http://bind10.isc.org/ticket/1600#comment:33>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development
More information about the bind10-tickets
mailing list