Merge branch 'release/1.1.0-rc2' into develop

.goxc.json

@@ -7,7 +7,7 @@
 	"Os": "darwin freebsd linux windows",
 	"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
 	"PackageVersion": "1.1.0",
-	"PrereleaseInfo": "rc1",
+	"PrereleaseInfo": "rc2",
 	"ConfigVersion": "0.9",
 	"BuildSettings": {
 		"LdFlagsXVars": {

CHANGELOG.md

@@ -1,8 +1,12 @@
-# Change Log
+Change Log
+==========
+
 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-rc2] - 2016-03-06
+------------------------
+
 ### Added
 - Message Cap to status page
 - Search-while-you-type message list filter
@@ -11,7 +15,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Shutdown hang in retention scanner
 - Display empty subject as `(No Subject)`
 
-## [1.1.0-rc1] - 2016-03-04
+[1.1.0-rc1] - 2016-03-04
+------------------------
+
 ### Added
 - Inbucket now builds with Go 1.5 or 1.6
 - Project can build & run inside a Docker container
@@ -24,14 +30,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - RESTful API moved to `/api/v1` base URI
 - More graceful shutdown on Ctrl-C or when errors encountered
 
-## [1.0] - 2014-04-14
+[1.0] - 2014-04-14
+------------------
+
 ### Added
 - Add new configuration option `mailbox.message.cap` to prevent individual
   mailboxes from growing too large.
 - Add Link button to messages, allows for directing another person to a
   specific message.
 
-[Unreleased]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...develop
+[Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop
+[1.1.0-rc2]:  https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...1.1.0-rc2
 [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
 

inbucket.go

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