Merge pull request #17 from splunk/develop

Merge develop with master
splunk · Apr 23, 2020 · ccb5f34 · ccb5f34
2 parents 7040c4c + d6923cf
commit ccb5f34
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 
-## [0.2.1]
+## [0.2.3]
+- Added support for multi-line values in .conf files.  See issue [#12](https://github.com/splunk/vscode-extension-splunk/issues/12)
+- Fix for "The URL specified for the Splunk REST API is incorrect". See issue [#14](https://github.com/splunk/vscode-extension-splunk/issues/14)
+
+## [0.2.2]
 - Added configuration checking for .conf file values:
   - `<boolean>`
   - `<0 or positive integer>`, `<unsigned integer>`, `<positive integer>`, `<non-negative integer>`

diff --git a/README.md b/README.md
@@ -36,6 +36,10 @@ This extension also provides capabilities for debugging user-generated Python co
 
 Splunk Enterprise can be running on the same machine as Visual Studio Code, on a remote machine, or in a public cloud provider.
 
+## Documentation
+Documentation can be found in the [wiki](https://github.com/splunk/vscode-extension-splunk/wiki) hosted on the public repository.
+
+[https://github.com/splunk/vscode-extension-splunk/wiki](https://github.com/splunk/vscode-extension-splunk/wiki)
 
 ## Support
 

diff --git a/out/embeddedReportProvider.js b/out/embeddedReportProvider.js
diff --git a/out/extension.js b/out/extension.js
diff --git a/out/savedSearchProvider.js b/out/savedSearchProvider.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "splunk",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "publisher": "Splunk",
     "engines": {
         "vscode": "^1.40.0"
@@ -86,7 +86,7 @@
                     "default": false,
                     "description": "When auto-completing settings, trim whitespace around the '=' sign. For example, key = value will become key=value.\nNote: changing this setting requires a restart of Visual Studio Code."
                 },
-                "splunk.commands.splunk REST URL": {
+                "splunk.commands.splunkRestUrl": {
                     "type": "string",
                     "scope": "resource",
                     "default": "https://localhost:8089",