Merge pull request #6525 from hashicorp/release-0100

Merge 0.10.0 release branch back into master

CHANGELOG.md

@@ -3,7 +3,7 @@
 IMPROVEMENTS:
  * client: Enable setting tags on Consul Connect sidecar service
 
-## 0.10.0 (Unreleased)
+## 0.10.0 (October 22, 2019)
 
 FEATURES:
  * **Consul Connect**: Nomad may now register Consul Connect services and
@@ -41,6 +41,8 @@ BUG FIXES:
  * ui: Fixed a bug where the allocation log viewer would render HTML or hide content that matched XML syntax [[GH-6048](https://github.com/hashicorp/nomad/issues/6048)]
  * ui: Fixed a bug where allocation log viewer doesn't show all content in Firefox [[GH-6466](https://github.com/hashicorp/nomad/issues/6466)]
  * ui: Fixed navigation via clicking recent allocation row [[GH-6087](https://github.com/hashicorp/nomad/pull/6087)]
+ * ui: Fixed a bug where the allocation log viewer would render HTML or hide content that matched XML syntax [[GH-6048](https://github.com/hashicorp/nomad/issues/6048)]
+ * ui: Fixed a bug where allocation log viewer doesn't show all content in Firefox [[GH-6466](https://github.com/hashicorp/nomad/issues/6466)]
 
 ## 0.9.6 (October 7, 2019)
 

client/fingerprint/storage_windows.go

@@ -6,7 +6,7 @@ import (
 	"syscall"
 )
 
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.generated.go storage_windows.go
+//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.go storage_windows.go
 
 //sys	getDiskFreeSpaceEx(dirName *uint16, availableFreeBytes *uint64, totalBytes *uint64, totalFreeBytes *uint64) (err error) = kernel32.GetDiskFreeSpaceExW
 

version/version.go

@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// The main version number that is being run at the moment.
-	Version = "0.10.0"
+	Version = "0.10.1"
 
 	// 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