Merge branch 'master' into rpc

Conflicts:
	linux/ws_main.py
	linux_dpdk/ws_main.py

1 files changed, 7 insertions, 0 deletions

diff --git a/external_libs/yaml-cpp/test/main.cpp b/external_libs/yaml-cpp/test/main.cpp
new file mode 100644
index 00000000..64c69f10
--- /dev/null
+++ b/external_libs/yaml-cpp/test/main.cpp
@@ -0,0 +1,7 @@
+#include "tests.h"
+
+int main()
+{
+	Test::RunAll();
+	return 0;
+}