summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-09-24 10:56:23 -0700
committerClaire McQuin <claire@getchef.com>2014-09-24 10:56:23 -0700
commit07527f98c1d2aeb2e60711721d581426961cc761 (patch)
tree8f4dc355badd3c08c312db2357a8811ad66d1fc5 /CHANGELOG.md
parentf7407baf9df38f5f2f58e1e676e710411fb49f7b (diff)
parentbed2af024937259b93bb6955ee794cf70e20693f (diff)
downloadchef-07527f98c1d2aeb2e60711721d581426961cc761.tar.gz
Merge branch 'master' into mcquin/escape_globmcquin/escape_glob
Conflicts: CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c8a44b6a0..fe182840e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -136,6 +136,7 @@
* Set :ssl_verify_mode to :verify_peer by default.
* Add homebrew provider for package resource, use it by default on OS X (Issue #1709)
* Add escape_glob method to PathHelper, update glob operations.
+* Verify x509 properties of certificates in the :trusted_certs_dir during knife ssl check.
## Last Release: 11.14.2