Merge branch 'updates'

markolson · Jun 6, 2016 · 827f4a7 · 827f4a7
2 parents fac2b30 + 2242572
commit 827f4a7
Show file tree

Hide file tree

Showing 13 changed files with 183 additions and 135 deletions.
diff --git a/.bundle/config b/.bundle/config
@@ -0,0 +1 @@
+--- {}
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -16,7 +16,7 @@ platforms:
     box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
     run_list:
       - recipe[apt]
-  - name: centos-7.0
+  - name: centos-7.1
 
 suites:
   - name: known_hosts

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -19,10 +19,9 @@ ClassLength:
 MethodLength:
   Max: 25
   Severity: refactor
-SingleSpaceBeforeFirstArg:
+SpaceBeforeFirstArg:
   Enabled: false
 AbcSize:
   Enabled: false
 Documentation:
   Enabled: false
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
 # CHANGELOG for ssh
+
+## 0.10.14
+* #54 fix issues in readme (Thanks to @javierav)
+* #57 remove un-needed conditional (thanks to @elser82)
+* #58 fix deprication warning in default value of provider (thanks to @CloCkWeRX)
+* #59 - fix known_hosts diretctory creation (thanks to @atward)
+* several updates to get rubocop and foodcritic happy
+
 ## 0.10.12
 * Updated authorized_keys to allow for commas, quotes, and spaces inside the options.
 * fixed a bug that was adding a single space to the end of entries.