From d9532b6fa0cbabb9e2882e3a016c983018709cd1 Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Mon, 5 Feb 2018 15:55:26 +0000 Subject: [PATCH 1/2] Switch back to upstream global-tunnel-ng Connects-To: #780 Change-Type: patch --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 603fb09e..67ec0b48 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "ejs": "^2.5.7", "etcher-image-write": "^9.0.3", "express": "^4.13.3", - "global-tunnel-ng": "github:zvin/global-tunnel#dont-proxy-connections-to-file-sockets", + "global-tunnel-ng": "^2.1.1", "hasbin": "^1.2.3", "inquirer": "^3.1.1", "is-root": "^1.0.0", @@ -149,4 +149,4 @@ "optionalDependencies": { "removedrive": "^1.0.0" } -} \ No newline at end of file +} From 5c0ba5d06c39076535c437af1166258b0a3a0809 Mon Sep 17 00:00:00 2001 From: "resin-io-versionbot[bot]" Date: Mon, 5 Feb 2018 19:00:36 +0000 Subject: [PATCH 2/2] v6.12.9 --- CHANGELOG.md | 4 ++++ package.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1d90aac..6a73ab00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY! This project adheres to [Semantic Versioning](http://semver.org/). +## v6.12.9 - 2018-02-05 + +* Switch back to upstream global-tunnel-ng #781 [Alexis Svinartchouk] + ## v6.12.8 - 2018-02-03 * Fix uuid params being parsed a numbers #774 [Thodoris Greasidis] diff --git a/package.json b/package.json index 67ec0b48..0d140d1b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "resin-cli", - "version": "6.12.8", + "version": "6.12.9", "description": "The official resin.io CLI tool", "main": "./build/actions/index.js", "homepage": "https://github.com/resin-io/resin-cli", @@ -149,4 +149,4 @@ "optionalDependencies": { "removedrive": "^1.0.0" } -} +} \ No newline at end of file