Merge branch 'release/1.1.0-rc1' into develop

.goxc.json

@@ -5,9 +5,9 @@
 	],
 	"Arch": "amd64",
 	"Os": "darwin freebsd linux windows",
-	"ResourcesInclude": "README*,LICENSE*,inbucket.bat,etc,themes",
+	"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
 	"PackageVersion": "1.1.0",
-	"PrereleaseInfo": "alpha",
+	"PrereleaseInfo": "rc1",
 	"ConfigVersion": "0.9",
 	"BuildSettings": {
 		"LdFlagsXVars": {

CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased]
+## [1.1.0-rc1]
 ### Added
 - Inbucket now builds with Go 1.5 or 1.6
 - Project can build & run inside a Docker container
@@ -22,7 +22,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add Link button to messages, allows for directing another person to a
   specific message.
 
-[Unreleased]: https://github.com/jhillyerd/inbucket/compare/1.0...HEAD
+[Unreleased]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...develop
+[1.1.0-rc1]:  https://github.com/jhillyerd/inbucket/compare/1.0...1.1.0-rc1
 [1.0]:        https://github.com/jhillyerd/inbucket/compare/1.0-rc1...1.0
 
 See http://keepachangelog.com/ for instructions on how to update this file.

inbucket.go

@@ -21,7 +21,7 @@ import (
 
 var (
 	// VERSION contains the build version number, populated during linking by goxc
-	VERSION = "1.1.0.snapshot"
+	VERSION = "1.1.0-rc1"
 
 	// BUILDDATE contains the build date, populated during linking by goxc
 	BUILDDATE = "undefined"