Merge remote-tracking branch 'origin/master' into vue_react_migration

# Conflicts:
#	src/common/user-store_spec.ts
#	src/main/context-handler.ts
#	tsconfig.json
This commit is contained in:
Roman committed 2020-07-17 23:25:50 +03:00
commit ef3962f8b5
3 files changed
+83 -16

No files matched your search

+1 -1
View File
@@ -127,7 +127,7 @@ export class Kubectl {
}
try {
const { stdout, stderr } = await promiseExec(`"${this.path}" version --client=true -o json`)
const { stdout } = await promiseExec(`"${this.path}" version --client=true -o json`)
const output = JSON.parse(stdout)
let version: string = output.clientVersion.gitVersion
if (version[0] === 'v') {