GitLab

    Merge branch '363-13966-dhcp-option-start-sequence'

src/lib/dhcp/libdhcp++.*
    LibDHCP::packOptions4() - added logic to emit message type option (53) first

src/lib/dhcp/tests/pkt4_unittest.cc
    Updated unit tests accordingly

Okayed on jabber.

    Merge branch '344-cql-upgrade-script-fails-on-ubuntu'

    modified:   src/lib/dhcp/packet_queue_ring.h

 This is supposed to fix the last error, but for some reason it doesn't.

Agreed on jabber.