Merge pull request #54 from bflad/3_13_0_release

Prepare for 3.13.0 cookbook release

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.13.0
+
+* Bugfix: [#43][]: Fix for "sh: 'rsync' no such file or directory" on RHEL-like systems (install rsync package in backup_client recipe)
+* Bugfix: [#45][]: Fixed HTTP authentication (disables apache auth_basic)
+* Enhancement: [#44][]: Settings attributes now correctly deep merge and override via data bags
+* Enhancement: [#41][] / [#47][]: Default to Stash 3.6.0, Stash Backup Client 1.6.0
+
 ## 3.12.1
 
 * Enhancement: Default to Stash 3.3.2
@@ -427,3 +434,8 @@ To switch to new defaults:
 [#36]: https://github.com/bflad/chef-stash/issues/36
 [#37]: https://github.com/bflad/chef-stash/issues/37
 [#39]: https://github.com/bflad/chef-stash/issues/39
+[#41]: https://github.com/bflad/chef-stash/issues/41
+[#43]: https://github.com/bflad/chef-stash/issues/43
+[#44]: https://github.com/bflad/chef-stash/issues/44
+[#45]: https://github.com/bflad/chef-stash/issues/45
+[#47]: https://github.com/bflad/chef-stash/issues/47

README.md

@@ -54,7 +54,7 @@ install_type | Stash install type - "standalone" only for now | String | standal
 url_base | URL base for Stash install | String | http://www.atlassian.com/software/stash/downloads/binary/atlassian-stash
 url | URL for Stash install | String | auto-detected (see attributes/default.rb)
 user | user to run Stash | String | stash
-version | Stash version to install | String | 3.3.2
+version | Stash version to install | String | 3.6.0
 
 ### Stash Backup Client Attributes
 
@@ -69,7 +69,7 @@ install_path | location to install Stash Backup Client | String | /opt/atlassian
 password | Stash administrative user password | String | changeit
 url_base | URL base for Stash Backup Client install | String | http://downloads.atlassian.com/software/stash/downloads/stash-backup-distribution
 user | Stash administrative user | String | admin
-version | Stash Backup Client version to install | String | 1.5.0
+version | Stash Backup Client version to install | String | 1.6.0
 
 ### Stash Backup Client Cron Attributes
 

metadata.rb

@@ -4,7 +4,7 @@
 license 'Apache 2.0'
 description 'Installs/Configures Atlassian Stash'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '3.12.1'
+version '3.13.0'
 recipe 'stash', 'Installs/Configures Atlassian Stash'
 recipe 'stash::apache2', 'Installs/Configures Apache 2 proxy for Stash'
 recipe 'stash::backup_client', 'Installs/Configures Atlassian Stash Backup Client'