GitLab

Conflicts:
	src/lib/dhcp/tests/cfgmgr_unittest.cc
	src/lib/dhcp/triplet.h

Conflicts:
	ChangeLog
	src/lib/dhcp/tests/Makefile.am

Also move GTEST_LDADD to the bottom of the list of LDADDs.

I didn't get this reviewed, but make check still worked for me.

Conflicts:
	src/lib/datasrc/memory/Makefile.am
	src/lib/datasrc/memory/benchmarks/Makefile.am
	src/lib/datasrc/memory/zone_data.h

Conflicts:
	ChangeLog

Conflicts:
	tests/tools/dhcp-ubench/dhcp-perf-guide.html
	tests/tools/perfdhcp/Makefile.am

The dhcp-perf-guide.html is supposed to be created with make.

 - If it omits setting the counters, which are notifyoutv4, notifyoutv6,
   xfrrej, and xfrreqdone, they are set to None as defaults when the object is
   initiating. Then when each counter is invoked in some method, it checks
   whether the counter is Nonetype or not. Unless the counter is NoneType, it
   invokes the counter.  After that unless the counter is callable, a TypeError
   exception would be raised.

 - added some tests for this changes

 - removed some dead code from xfrout.py.in

TreeNodeRRset::getTTL() is now implemented, so "throw unconditionally" is
simply wrong.
should be trivial enough, directly committing.

regarding the variable name, "local_mem_sgmt_" is now awkward because it's
now of the base class type.

okayed on jabber.

- fix doxygen and comments
- inclusion order fix
- remove dead line from makefile