git.ipfire.org Git - thirdparty/kea.git/commit

]> git.ipfire.org Git - thirdparty/kea.git/commit

projects / thirdparty / kea.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cddd3f5 33dbf01)

author	Andrei Pavel <andrei.pavel@qualitance.com>
	Thu, 17 Aug 2017 18:15:48 +0000 (21:15 +0300)
committer	Andrei Pavel <andrei.pavel@qualitance.com>
	Thu, 17 Aug 2017 18:15:48 +0000 (21:15 +0300)
commit	0ba37f938331546d45d60efac5f7c8e92384e8e8
tree	db26cfee095eb95fc831605e6c0c75c9ab05b826	tree \| snapshot
parent	cddd3f5459198452cc110f0d3b0965e4ba3692cb	commit \| diff
parent	33dbf0160243effd63c2bdb1bfc7b8735f542e40	commit \| diff

Merge branch 'isc-master' into cassandra-update

14 files changed:

AUTHORS	diff1 \|	diff2 \|	blob \| history
doc/guide/dhcp4-srv.xml	diff1 \|	diff2 \|	blob \| history
doc/guide/dhcp6-srv.xml	diff1 \|	diff2 \|	blob \| history
src/bin/admin/admin-utils.sh	diff1 \|	diff2 \|	blob \| history
src/bin/admin/kea-admin.in	diff1 \|	diff2 \|	blob \| history
src/bin/admin/tests/cql_tests.sh.in	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/cql_connection.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/cql_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/cql_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/dhcpsrv_messages.mes	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/parsers/dbaccess_parser.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/isc-projects/kea.git