summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-08-08 08:44:59 -0700
committerClaire McQuin <claire@getchef.com>2014-08-08 08:44:59 -0700
commit54db1bedbc0a8d00e3b1fc12c50658f1d48b7a6e (patch)
tree99fede241b3b91687a15e55a9d045885562c8056
parent1c519665237a86c3aed575663b7a3654ca82305b (diff)
downloadchef-54db1bedbc0a8d00e3b1fc12c50658f1d48b7a6e.tar.gz
Update for merges
-rw-r--r--CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c51b2ea2bf..98aa735d7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
each one.
* Fix RPM package version detection (Issue 1554)
* Don't override :default provider map if :default passed as platform (OC-11667).
+* Fix SuSE package removal failure (Issue 1732).
* [**Phil Dibowitz**](https://github.com/jaymzh):
@@ -59,6 +60,12 @@
* increase command timeout length for package installation.
* [**sawanoboly**](https://github.com/sawanoboly):
Use shared_path for deploy resource.
+* [**Victor Hahn**](https://github.com/victorhahncastell):
+ Add template syntax check to files in the templates/ dir only.
+* [**Jordan**](https://github.com/jordane):
+ Allow git provider to checkout existing branch names.
+* [**Eric Herot**](https://github.com/eherot):
+ Add whitespace boundaries to some mount point references in mount provider.
## Last Release: 11.14.2