Merge branch 'master' into master-2

# Conflicts: # LICENSE
2015-03-27 00:06:28 +01:00
parent 8f42134415
commit 7cf755493c
29 changed files with 669 additions and 0 deletions
--- a/test/service/webservice/pybin/services_requests_config.json
+++ b/test/service/webservice/pybin/services_requests_config.json
@@ -0,0 +1,9 @@
+{
+  "":
+  {
+    "host_pattern": "10.0.0.1",
+    "path_pattern": "index.php",
+    "protocol_pattern": "http",
+    "response_content_path": "cgi-bin/test.html"
+  }
+}