Merge branch '4.0.x' into 4.x

open-io · Jul 21, 2017 · b23b9b2 · b23b9b2
2 parents 732ca9d + 92e408d
commit b23b9b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Variables.md b/Variables.md
@@ -352,7 +352,7 @@ Used by `gcc`
 
 > Default chunk size for the given namespace.
 
- * default: **104857600**
+ * default: **10485760**
  * type: gint64
  * cmake directive: *OIO_NS_CHUNK_SIZE*
  * range: 1 -> G_MAXINT64

diff --git a/all-requirements.txt b/all-requirements.txt
@@ -1,5 +1,6 @@
 cliff>=2.0.0,<2.1.0
-eventlet>=0.15.2
+# This can be simplified when https://github.com/eventlet/eventlet/issues/401 is fixed
+eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2
 requests<2.13.0
 werkzeug>=0.9.1
 redis>=2.10.3

diff --git a/conf.json b/conf.json
@@ -131,7 +131,7 @@
 			{ "type": "int64", "name": "oio_ns_chunk_size",
 				"key": "ns.chunk_size",
 				"descr": "Default chunk size for the given namespace.",
-				"def": "100Mi", "min": 1, "max": "max" },
+				"def": "10Mi", "min": 1, "max": "max" },
 
 			{ "type": "string", "name": "oio_ns_service_update_policy",
 				"key": "ns.service_update_policy",