From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 22 Nov 2016 17:52:44 +0000 (+0100)
Subject: [master] Merge branch 'trac5023' (contexts in v6 pools)
X-Git-Tag: trac4631b_base~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f81789e19b72c933bcf86e402b417c63bd7bd3f;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5023' (contexts in v6 pools)

# Conflicts:
#	src/lib/dhcpsrv/pool.h
---

4f81789e19b72c933bcf86e402b417c63bd7bd3f
diff --cc src/lib/dhcpsrv/pool.h
index acedb01f45,ac88371ada..cbeb71ae96
--- a/src/lib/dhcpsrv/pool.h
+++ b/src/lib/dhcpsrv/pool.h
@@@ -8,10 -8,10 +8,12 @@@
  #define POOL_H
  
  #include <asiolink/io_address.h>
 +#include <dhcp/option6_pdexclude.h>
+ #include <boost/shared_ptr.hpp>
+ #include <cc/data.h>
  #include <dhcpsrv/cfg_option.h>
  #include <dhcpsrv/lease.h>
 +#include <boost/shared_ptr.hpp>
  
  #include <vector>