BIND 10 #507: Empty node processing: In-memory data source changes

[BIND 10 Development]

#507: Empty node processing: In-memory data source changes
-------------------------------------+-------------------------------------
                 Reporter:  stephen  |                Owner:  jinmei
                     Type:           |               Status:  reviewing
  enhancement                        |            Milestone:  A-Team-
                 Priority:  major    |  Sprint-20110209
                Component:  data     |           Resolution:
  source                             |            Sensitive:  0
                 Keywords:           |  Add Hours to Ticket:  0
Estimated Number of Hours:  8.0      |          Total Hours:  0
                Billable?:  1        |
                Internal?:  0        |
-------------------------------------+-------------------------------------

Comment (by jinmei):

 Replying to [comment:5 vorner]:

 > The changes themself look good to me and I would say it could go to
 master. However, there's an issue not related to the code.
 >
 > You mention you merged some changes from #517, but not merged
 everything. That is not true, at last from what is in the git history. You
 branched at some place from #517 and deleted some of the code that was
 there. Now, how does git do when you merge (by the usual algorithm)?

 Thanks for the careful check and suggestions.  You were right.  I
 understood what I did, but the terminology wasn't really accurate.

 > I propose some solutions to this issue, and I'm willing to help with any
 of them, if you like:
 >  - Revert the commit that contains the deletes
 (1ab958cdc6f1ebdbf88f863a4a15d6a5783035bc) and wait for review of #517. In
 that case this branch will contain both delete and recreation of the code,
 which will negate each other (because git takes only the overall change,
 not single steps, if the history is linear) and therefore the code should
 stay there.

 Now that #517 has been merged this seems to be the easiest choice.  So
 I did it and completed the merge.

 I'm now closing the ticket.

-- 
Ticket URL: <https://bind10.isc.org/ticket/507#comment:6>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development