Merge branches 'development/7.8' and 'w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2' into tmp/octopus/w/7.8/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2

Merge branch 'development/7.7' into tmp/octopus/w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2
Merge branch 'w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2' into tmp/octopus/w/7.8/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2
2020-07-21 00:48:12 +00:00 · 2020-07-21 00:48:12 +00:00 · 2020-07-01 13:07:13 +00:00 · 2020-07-01 13:07:12 +00:00 · 2020-07-01 13:07:06 +00:00
2 changed files with 9 additions and 9 deletions
--- a/package.json
+++ b/package.json
@ -37,7 +37,7 @@
    "xml2js": "~0.4.23"
  },
  "optionalDependencies": {
-    "ioctl": "2.0.0"
+    "ioctl": "2.0.2"
  },
  "devDependencies": {
    "@sinonjs/fake-timers": "^6.0.1",
--- a/yarn.lock
+++ b/yarn.lock
@ -222,7 +222,7 @@ better-assert@~1.0.0:
  dependencies:
    callsite "1.0.0"

-bindings@^1.1.1:
+bindings@^1.5.0:
  version "1.5.0"
  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
@ -938,13 +938,13 @@ inquirer@^0.12.0:
    strip-ansi "^3.0.0"
    through "^2.3.6"

-ioctl@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ioctl/-/ioctl-2.0.0.tgz#2aacbd73eb6ff9ad01fdf3ecc3390ee57781100e"
-  integrity sha1-Kqy9c+tv+a0B/fPswzkO5XeBEA4=
+ioctl@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/ioctl/-/ioctl-2.0.2.tgz#21543f661cb1b044761cbf721f5dde6be08ed060"
+  integrity sha512-GPEiU99bJb3Z50JDRujQ9t+q4JaRvc1UrD7F5/kHDVWlRA3L4TMwqbMw/XIu/BzqccFP8OfsK+JIXmlAvJDs1g==
  dependencies:
-    bindings "^1.1.1"
-    nan "^2.3.2"
+    bindings "^1.5.0"
+    nan "^2.14.0"

 ioredis@4.9.5:
  version "4.9.5"
@ -1370,7 +1370,7 @@ mute-stream@0.0.5:
  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
  integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=

-nan@^2.14.0, nan@^2.3.2:
+nan@^2.14.0:
  version "2.14.0"
  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
Author	SHA1	Message	Date
bert-e	e7a303d809	Merge branches 'development/7.8' and 'w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2' into tmp/octopus/w/7.8/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2	2020-07-21 00:48:12 +00:00
bert-e	cf5c7e453e	Merge branch 'development/7.7' into tmp/octopus/w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2	2020-07-21 00:48:12 +00:00
bert-e	ab12b96a21	Merge branch 'w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2' into tmp/octopus/w/7.8/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2	2020-07-01 13:07:13 +00:00
bert-e	b4068b189b	Merge branch 'dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2' into tmp/octopus/w/7.7/dependabot/npm_and_yarn/development/7.4/ioctl-2.0.2	2020-07-01 13:07:12 +00:00
dependabot[bot]	2ec064e2b5	build(deps): Bump ioctl from 2.0.0 to 2.0.2 Bumps [ioctl](https://github.com/santigimeno/node-ioctl) from 2.0.0 to 2.0.2. - [Release notes](https://github.com/santigimeno/node-ioctl/releases) - [Commits](https://github.com/santigimeno/node-ioctl/compare/2.0.0...v2.0.2) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-01 13:07:06 +00:00