Merge pull request #7972 from hashicorp/0-11-3-return-to-dev

post-release merge

CHANGELOG.md

@@ -1,4 +1,6 @@
-## 0.11.2 (Unreleased)
+## 0.11.3 (Unreleased)
+
+## 0.11.2 (May 14, 2020)
 
 FEATURES:
  * **Task dependencies UI**: task lifecycle charts and details
@@ -38,6 +40,7 @@ BUG FIXES:
  * ui: Fixed a bug where clicking stdout or stderr when already on that clicked view would pause log streaming [[GH-7820](https://github.com/hashicorp/nomad/issues/7820)]
  * ui: Fixed a race condition that made swithing from stdout to stderr too quickly show an error [[GH-7820](https://github.com/hashicorp/nomad/issues/7820)]
  * ui: Switching namespaces now redirects to Volumes instead of Jobs when on a Storage page [[GH-7896](https://github.com/hashicorp/nomad/issues/7896)]
+ * vault: Fixed a bug where nomad retries revoking tokens indefinitely [[GH-7959](https://github.com/hashicorp/nomad/issues/7959)]
 
 ## 0.11.1 (April 22, 2020)
 

ui/.storybook/preview-head.html

@@ -1,23 +1,7 @@
 <!-- This file is auto-generated by ember-cli-storybook -->
-<meta name="nomad-ui/config/environment" content="%7B%22modulePrefix%22%3A%22nomad-ui%22%2C%22environment%22%3A%22development%22%2C%22rootURL%22%3A%22%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22blockingQueries%22%3Atrue%2C%22mirageScenario%22%3A%22smallCluster%22%2C%22mirageWithNamespaces%22%3Atrue%2C%22mirageWithTokens%22%3Atrue%2C%22mirageWithRegions%22%3Atrue%2C%22autoboot%22%3Afalse%7D%2C%22ember-cli-mirage%22%3A%7B%22enabled%22%3Atrue%2C%22excludeFilesFromBuild%22%3Afalse%2C%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
-<link rel="stylesheet" href="./assets/vendor.css" />
-<link rel="stylesheet" href="./assets/nomad-ui.css" />
-<link rel="icon" href=".//favicon.png" />
-<script>
-            (function() {
-              var srcUrl = null;
-              var host = location.hostname || 'localhost';
-              var defaultPort = location.protocol === 'https:' ? 443 : 80;
-              var port = 4200;
-              var path = '';
-              var prefixURL = '';
-              var src = srcUrl || prefixURL + '/_lr/livereload.js?port=' + port + '&host=' + host + path;
-              var script = document.createElement('script');
-              script.type = 'text/javascript';
-              script.src = location.protocol + '//' + host + ':4200' + src;
-              document.getElementsByTagName('head')[0].appendChild(script);
-            }());
-          </script>
-<script src="./assets/vendor.js"></script>
-<script>runningTests = true; Ember.testing=true;</script>
-<script src="./assets/nomad-ui.js"></script>
+<meta name="nomad-ui/config/environment" content="%7B%22modulePrefix%22%3A%22nomad-ui%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%2Fui%2F%22%2C%22locationType%22%3A%22auto%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%2C%22_JQUERY_INTEGRATION%22%3Atrue%7D%2C%22APP%22%3A%7B%22blockingQueries%22%3Atrue%2C%22mirageScenario%22%3A%22smallCluster%22%2C%22mirageWithNamespaces%22%3Atrue%2C%22mirageWithTokens%22%3Atrue%2C%22mirageWithRegions%22%3Atrue%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Atrue%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%7D" />
+<link rel="stylesheet" href="./assets/vendor-9cb229908de3839464729510b242bdb3.css" />
+<link rel="stylesheet" href="./assets/nomad-ui-dbc99bef0439ab344d94b9b1249b98c8.css" />
+<link rel="icon" href=".//favicon-1c2527a7a07d130ecbafce75e4615a69.png" />
+<script src="./assets/vendor-bf3664ceb927a898f533450b8c468b46.js"></script>
+<script src="./assets/nomad-ui-586f2a487b3b1785b102ea40971cfbcc.js"></script>

version/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// The main version number that is being run at the moment.
-	Version = "0.11.2"
+	Version = "0.11.3"
 
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release