merge master

Signed-off-by: Adam-Battenburg <Adam.Battenburg@ibm.com>
zowe · Jun 25, 2019 · 33d54f3 · 33d54f3
2 parents a1ea1a5 + 0145e45
commit 33d54f3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to the "vscode-extension-for-zowe" extension will be documented in this file.
 
+## 0.21.0
+
+- Added the Upload member to datasets. Thanks Kristina Mayo
+- Addressed same file issue with Favorites in USS explorer. Thanks to Rodney-Wilson and Lauren-Li
+- USS Favorites. Ensure file deletion synchronisation. Thanks to Rodney-Wilson and Lauren-Li
+
 ## 0.20.0
 
 - Combined Spool files with Jobs in Jobs view. Colin Stone

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-extension-for-zowe",
   "displayName": "Zowe",
   "description": "VS Code extension, powered by Zowe CLI, that streamlines interaction with mainframe data sets, USS files, and jobs",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "publisher": "Zowe",
   "repository": {
     "url": "https://github.com/zowe/vscode-extension-for-zowe"