BIND 10 trac3221, created. 5ff46cb07dfa9f6b373ea9466d7675efa320d926 Merge branch 'trac1366'

[BIND 10 source code commits]

The branch, trac3221 has been created
        at  5ff46cb07dfa9f6b373ea9466d7675efa320d926 (commit)

- Log -----------------------------------------------------------------
commit 5ff46cb07dfa9f6b373ea9466d7675efa320d926
Merge: 99ca756 477969e
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 3 17:46:22 2014 +0530

    Merge branch 'trac1366'

commit 99ca75676abbf8360b807a1c36143d87f393c89a
Merge: cc0fc60 fb50e3b
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 3 15:41:45 2014 +0530

    Merge branch 'trac1796'

commit cc0fc600dfdc1f4652aa7ec5a7472db06c1cbd4d
Merge: 2f88f1b 30c527e
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Feb 3 14:39:58 2014 +0530

    Merge branch 'trac1397'
    
    Conflicts:
    	src/lib/dns/tests/rrset_unittest.cc
    
    The merge conflict resolution was reviewed by Shane on Jabber.

commit 2f88f1b4926783fd03871f434b88fbb3d801e590
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Jan 31 10:40:48 2014 +0100

    [master] Added ChangeLog entry 744 for #3295.
    
    Also, removed spurious whitespaces from 743.

commit aa1c94a54114e848c64771fde308fc9ac0c00fd0
Merge: 16750ef e1938e5
Author: Marcin Siodelski <marcin at isc.org>
Date:   Fri Jan 31 10:22:25 2014 +0100

    [master] Merge branch 'trac3295_2'
    
    Conflicts:
    	src/bin/dhcp6/dhcp6_srv.cc

commit 16750ef2a63764e6b21b034af8db60bf0b6a0051
Merge: 0e6c5af 2d742ae
Author: Shane Kerr <shane at time-travellers.org>
Date:   Fri Jan 31 09:56:48 2014 +0100

    Merge branch 'trac3010'

commit 0e6c5afbe43ccc3b2478bd1f935255bd7d61906e
Merge: 3327e16 507aae9
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 31 10:53:36 2014 +0530

    Merge branch 'trac3313'

commit 3327e16875dc619a549247cb4dee855be5d538d5
Merge: 1f0e3dc 7058dd1
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 31 10:27:32 2014 +0530

    Merge branch 'trac3314'

commit 1f0e3dc6f4de89e71282eb500a5841ff85693764
Merge: 13e9ea2 040a4ae
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 31 10:13:53 2014 +0530

    Merge branch 'trac3286'

commit 13e9ea2f4647b3f0b953bce7562ad71f39b7472f
Author: Coleen O'Brien <coleen at isc.org>
Date:   Thu Jan 30 18:14:47 2014 -0500

    Updated bind_control.py which did not make it in in last commit - this
       references the stored default_user.csv file so lettuce tests run.
       Change reviewed by jreed in jabber.

commit 4665a8ff7f7d2667c4d586f7d54478edf683cfd9
Author: Coleen O'Brien <coleen at isc.org>
Date:   Thu Jan 30 15:56:00 2014 -0500

    Modification to add default user for lettuce tests & reference this file
    code review by jreed

commit 15f0fc3541cc60700463d6f94b5116024144e5b0
Author: Thomas Markwalder <tmark at isc.org>
Date:   Thu Jan 30 10:09:28 2014 -0500

    [master] Added ChangeLog entry 743 for trac# 3282.

commit 42b1f1e4c4f5aa48b7588233402876f5012c043c
Merge: f6e165a 587c505
Author: Thomas Markwalder <tmark at isc.org>
Date:   Thu Jan 30 09:48:32 2014 -0500

    [master] Merge branch 'trac3282'
    
    Implements use of dhcp-ddns configuration parameters in b10-dhcp4.

commit 2d742ae954b869826da72d9c28cb088362839130
Author: Shane Kerr <shane at time-travellers.org>
Date:   Wed Jan 29 23:07:44 2014 +0100

    [3010] Avoid signed integer overflow

-----------------------------------------------------------------------