]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'trac3432'
authorThomas Markwalder <tmark@isc.org>
Wed, 28 May 2014 11:40:34 +0000 (07:40 -0400)
committerThomas Markwalder <tmark@isc.org>
Wed, 28 May 2014 11:40:34 +0000 (07:40 -0400)
commit80fea12a53d1e832d4e7b710ca6ea613300f73ea
treeed40e96f173bdfce595e8a7cd644a04f25da4906
parent209c646b0a530ed2cf0beeedfc78292fbc9bb651
parentfa96affbd84c7370ce0f248536736f6b0c88fe0c
[master] Merge branch 'trac3432'

Implements TSIG in D2

Fixed Conflicts:
src/bin/d2/nc_trans.cc
src/bin/d2/nc_trans.h
src/bin/d2/tests/nc_test_utils.cc
src/bin/d2/tests/nc_trans_unittests.cc
14 files changed:
doc/guide/bind10-guide.xml
src/bin/d2/d2_config.cc
src/bin/d2/d2_config.h
src/bin/d2/dhcp-ddns.spec
src/bin/d2/nc_trans.cc
src/bin/d2/nc_trans.h
src/bin/d2/tests/d2_cfg_mgr_unittests.cc
src/bin/d2/tests/d2_process_unittests.cc
src/bin/d2/tests/d_test_stubs.cc
src/bin/d2/tests/nc_add_unittests.cc
src/bin/d2/tests/nc_remove_unittests.cc
src/bin/d2/tests/nc_test_utils.cc
src/bin/d2/tests/nc_test_utils.h
src/bin/d2/tests/nc_trans_unittests.cc