Merge pull request #813 from alfred-bratterud/master

Alfreds Master to dev
includeos · Sep 5, 2016 · 8dfa8b6 · 8dfa8b6
2 parents 83c7f9b + 1870f9c
commit 8dfa8b6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/test/net/integration/dhcp/service.cpp b/test/net/integration/dhcp/service.cpp
@@ -25,7 +25,7 @@ using namespace net;
 
 void Service::start(const std::string&)
 {
-  net::Inet4::ifconfig<0>(5.0, [](bool timeout) {
+  net::Inet4::ifconfig<0>(10.0, [](bool timeout) {
       if (timeout)
         panic("DHCP timed out");
 

diff --git a/test/net/integration/dhcp/test_dhcp b/test/net/integration/dhcp/test_dhcp