Merge branch 'v6.x.zos' into v6.x.zos.trial

ibmruntimes · Dec 14, 2017 · 6d7387b · 6d7387b
2 parents eb34046 + c0b4009
commit 6d7387b
Show file tree

Hide file tree

Showing 1,044 changed files with 53,170 additions and 6,266 deletions.
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
@@ -131,9 +131,6 @@ rules:
   }, {
     selector: "ThrowStatement > CallExpression[callee.name=/Error$/]",
     message: "Use new keyword when throwing an Error."
-  }, {
-    selector: "CallExpression[callee.object.name='assert'][callee.property.name='fail'][arguments.length=1]",
-    message: "assert.fail() message should be third argument"
   }]
   no-tabs: error
   no-trailing-spaces: error

diff --git a/.gitignore b/.gitignore
@@ -110,3 +110,8 @@ icu_config.gypi
 # Xcode workspaces and project folders
 *.xcodeproj
 *.xcworkspace
+
+# libuv book and GitHub template
+deps/uv/.github/
+deps/uv/docs/code/
+deps/uv/docs/src/guide/
diff --git a/.mailmap b/.mailmap