• Stephen Morris's avatar
    [2342] Merge branch 'master' into trac2342 · 4e7a8f75
    Stephen Morris authored
    Conflicts:
    	doc/devel/mainpage.dox
    	src/lib/dhcp/Makefile.am
    	src/lib/dhcp/lease_mgr.cc
    	src/lib/dhcp/lease_mgr.h
    	src/lib/dhcp/tests/Makefile.am
    	src/lib/dhcp/tests/lease_mgr_unittest.cc
    
    A number of other files were modified to resolve incompatibilities
    in the way lease managers were created, and to promote the dummy
    "memfile" lease manager to a fully-fledged lease manager with
    unit tests.
    4e7a8f75
mainpage.dox 1.67 KB