Merge branch 'master' into rpc

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

1 files changed, 12 insertions, 0 deletions

diff --git a/external_libs/yaml-cpp/src/null.cpp b/external_libs/yaml-cpp/src/null.cpp
new file mode 100644
index 00000000..08fa9aae
--- /dev/null
+++ b/external_libs/yaml-cpp/src/null.cpp
@@ -0,0 +1,12 @@
+#include "yaml-cpp/null.h"
+#include "yaml-cpp/node.h"
+
+namespace YAML
+{
+	_Null Null;
+
+	bool IsNull(const Node& node)
+	{
+		return node.Read(Null);
+	}
+}