merging with latest master

Signed-off-by: imarom <imarom@cisco.com>

Conflicts:
	src/main_dpdk.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/linux/b b/linux/b
index e5fbbf36..5fadc440 100755
--- a/linux/b
+++ b/linux/b
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-waf=waf-1.9.3
+waf=waf-1.9.5
 p2=${PYTHON:-${PYTHON2:-python2.7}}
 p3=${PYTHON3:-python3}