]> git.ipfire.org Git - thirdparty/kea.git/commit
projects / thirdparty / kea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1084fad b8b5781)
Merge branch 'trac4027' of github.com:isc-projects/kea into trac4027
authorJINMEI Tatuya <jinmei@wide.ad.jp>
Sat, 31 Oct 2015 09:49:53 +0000 (18:49 +0900)
committerJINMEI Tatuya <jinmei@wide.ad.jp>
Sat, 31 Oct 2015 09:49:53 +0000 (18:49 +0900)
commit2accef346abe04a0364eb1414302be12d6f4e44b
tree99ecbebd00a60c24254bf6144d2910f24ca08e91tree
parent1084fad9535966a34ee5ae9982332850e7aa38e1commit | diff
parentb8b57816c2a31d220ef23efde9b29244f1bca24dcommit | diff
Merge branch 'trac4027' of github.com:isc-projects/kea into trac4027

with resolving conflict (the HEAD version wasn't complete)
src/lib/dhcp/tests/pkt4o6_unittest.cc
src/lib/dhcp/tests/pkt4o6_unittest.cc diff1 | diff2 | blob | history
Mirror of https://github.com/isc-projects/kea.git