From afdd551bd8e639a47efae539d0547b363d9afe56 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Mon, 13 Jan 2014 11:08:48 -0500 Subject: [PATCH] Update default version of Riak to 1.4.7. --- .kitchen.yml | 12 ++++++------ CHANGELOG.md | 4 ++++ README.md | 2 +- attributes/default.rb | 1 + attributes/package.rb | 2 +- attributes/source.rb | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 1aa5664..0f30676 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -16,7 +16,7 @@ platforms: package: checksum: ubuntu: - precise: "13b4649bf3b62782138ed0dc05ad70436a1045c795bf3c2f77a380904dedce85" + precise: "76593ae414cea84d42192a792b719b89d510ac917dfecacbbca2662ccabe5586" - name: debian-7.2.0 driver_config: box: opscode-debian-7.2.0 @@ -31,7 +31,7 @@ platforms: package: checksum: debian: - "7": "304955506014be1a88c9825936a2a7b9649ae04ca3c352787a4d70a4cb501c62" + "7": "7776338341cb8ddf4b8f4516b579d06ac47d224c5f0451e4ceb4172897a45c66" - name: centos-6.5 driver_config: box: opscode-centos-6.5 @@ -46,7 +46,7 @@ platforms: package: checksum: centos: - "6": "62a17575fc0d560183a05cfde202085b9d87e0c8a0e892b5ad471139f18c6332" + "6": "a7a31a69e450b6fa259dbbb167a44b1ca30af775107345040226cc54b7f88dcb" - name: centos-5.10 driver_config: box: opscode-centos-5.10 @@ -61,7 +61,7 @@ platforms: package: checksum: centos: - "5": "9381a2fcc8ba5a8673c7d56f33635fe41f3735df455c02d3f6e66b28c3f9ad4d" + "5": "72541e1a52a6ce78a5fffce80f7a65ef6e339c99b2c81e350e203e128c36ae38" suites: - name: default run_list: @@ -72,7 +72,7 @@ suites: package: version: minor: 4 - incremental: 6 + incremental: 7 - name: default13 run_list: - recipe[minitest-handler] @@ -102,7 +102,7 @@ suites: package: version: minor: 4 - incremental: 6 + incremental: 7 enterprise_key: <%= (ENV["RIAK_ENTERPRISE_KEY"].nil? ? "" : ENV["RIAK_ENTERPRISE_KEY"]) %> - name: enterprise13 run_list: diff --git a/CHANGELOG.md b/CHANGELOG.md index 61ee94d..3e5d5c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v2.4.4: + +* Riak `1.4.7` is now the default. + ## v2.4.3: * Add a constraint to `yum` cookbook dependency so that breaking changes in diff --git a/README.md b/README.md index ac1d6fc..d5e5c6e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ node['riak']['install_method'] = "package" # package.rb node['riak']['package']['version']['major'] = "1" node['riak']['package']['version']['minor'] = "4" -node['riak']['package']['version']['incremental'] = "6" +node['riak']['package']['version']['incremental'] = "7" ``` If you are installing Riak Enterprise with the `custom_repository` method, diff --git a/attributes/default.rb b/attributes/default.rb index a10a31c..c96a760 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -105,6 +105,7 @@ class ::Array default['riak']['config']['riak_kv']['vnode_vclocks'] = true default['riak']['config']['riak_kv']['listkeys_backpressure'] = true default['riak']['config']['riak_kv']['fsm_limit'] = 50000 +#default['riak']['config']['riak_kv']['secondary_index_sort_default'] = true default['riak']['config']['riak_kv']['object_format'] = "v1" # riak_kv storage_backend diff --git a/attributes/package.rb b/attributes/package.rb index b3a2661..313bf9b 100644 --- a/attributes/package.rb +++ b/attributes/package.rb @@ -22,7 +22,7 @@ default['riak']['package']['url'] = "http://s3.amazonaws.com/downloads.basho.com/riak" default['riak']['package']['version']['major'] = "1" default['riak']['package']['version']['minor'] = "4" -default['riak']['package']['version']['incremental'] = "6" +default['riak']['package']['version']['incremental'] = "7" default['riak']['package']['version']['build'] = "1" default['riak']['package']['config_dir'] = "/etc/riak" default['riak']['package']['local_package'] = false diff --git a/attributes/source.rb b/attributes/source.rb index de8406e..c9ab202 100644 --- a/attributes/source.rb +++ b/attributes/source.rb @@ -19,7 +19,7 @@ default['riak']['source']['url'] = "http://s3.amazonaws.com/downloads.basho.com/riak" default['riak']['source']['version']['major'] = "1" default['riak']['source']['version']['minor'] = "4" -default['riak']['source']['version']['incremental'] = "6" +default['riak']['source']['version']['incremental'] = "7" default['riak']['source']['prefix'] = "/usr/local" default['riak']['source']['config_dir'] = node['riak']['source']['prefix'] + "/riak/etc"