Merge branch 'release/v1.2.0' into develop

porcupie · Jun 3, 2016 · abb84bd · abb84bd
2 parents be689ec + 8308e80
commit abb84bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ We attempt to adhere to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### Changed
 
+## [1.2.0] - 2016-06-02
+### Added
+- Updated to pull in yp-engineering/rbd-docker-plugin v0.9.1.2, which
+  includes support for Docker Volume Create options: size, pool, fstype
+
 ## [1.1.1] - 2016-04-15
 ### Changed
 - Due to issue with golang 1.6 and strict Host header requirements, we

diff --git a/version.go b/version.go
@@ -3,4 +3,4 @@
 // license that can be found in the LICENSE file.
 package main
 
-const VERSION = "1.1.1"
+const VERSION = "1.2.0"