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

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

projects / thirdparty / kea.git / commit

author	Tomek Mrugalski <tomasz@isc.org>
	Fri, 9 Oct 2015 21:28:19 +0000 (23:28 +0200)
committer	Tomek Mrugalski <tomasz@isc.org>
	Fri, 9 Oct 2015 21:28:19 +0000 (23:28 +0200)
commit	884d8bb4a55d3d7b1b8f3f01efb312bd8dec399b
tree	f52b9a4fbdafa9c6bc588377347b2e0a38ccab7d	tree
parent	bd3538662421d6ef3623038d13f76f878f825644	commit \| diff
parent	5fc3a5aa3ff78f86eb5f67d0a49d88bb85fe9292	commit \| diff

[master] Merge branch 'trac3681_rebase' (Common MySQL Connection class)

Conflicts:
src/lib/dhcpsrv/lease_mgr.h
src/lib/dhcpsrv/memfile_lease_mgr.cc
src/lib/dhcpsrv/mysql_lease_mgr.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/schema_mysql_copy.h

21 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
src/bin/admin/scripts/mysql/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bin/admin/scripts/mysql/dhcpdb_create.mysql	diff1 \|	diff2 \|	blob \| history
src/bin/admin/tests/mysql_tests.sh.in	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr_factory.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr_factory.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/memfile_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/memfile_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/pgsql_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/pgsql_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/schema_mysql_copy.h	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
src/bin/admin/scripts/mysql/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bin/admin/scripts/mysql/dhcpdb_create.mysql	diff1 \|	diff2 \|	blob \| history
src/bin/admin/tests/mysql_tests.sh.in	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr_factory.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/lease_mgr_factory.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/memfile_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/memfile_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/mysql_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/pgsql_lease_mgr.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/pgsql_lease_mgr.h	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/generic_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/schema_mysql_copy.h	diff1 \|	diff2 \|	blob \| history