GitLab

# Conflicts:
#	ChangeLog

Okayed on jabber.

# Conflicts:
#	doc/examples/ddns/sample1.json

    Merge branch 'trac5252'

Correct a trivial error that led to a crash (instead of the raising
of an exception) when parsing an incorrect "pools" clause.

    Unit test now verifies Lease::state_.

src/lib/dhcpsrv/alloc_engine.cc
    AllocEngine::updateLeaseData() - added logic to set lease state
    to default and increment assigned stat if the lease is expired-reclaimed

src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc
    TEST_F(AllocEngine6Test, requestReuseDeclinedLease6Stats) - new test
    to verify the behavior