Skip to content

Commit 398d17f

Browse files
committed
Merge pull request #104 from basho/hc-riak147
Update default version of Riak to 1.4.7.
2 parents de5bc18 + afdd551 commit 398d17f

File tree

6 files changed

+14
-9
lines changed

6 files changed

+14
-9
lines changed

.kitchen.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ platforms:
1616
package:
1717
checksum:
1818
ubuntu:
19-
precise: "13b4649bf3b62782138ed0dc05ad70436a1045c795bf3c2f77a380904dedce85"
19+
precise: "76593ae414cea84d42192a792b719b89d510ac917dfecacbbca2662ccabe5586"
2020
- name: debian-7.2.0
2121
driver_config:
2222
box: opscode-debian-7.2.0
@@ -31,7 +31,7 @@ platforms:
3131
package:
3232
checksum:
3333
debian:
34-
"7": "304955506014be1a88c9825936a2a7b9649ae04ca3c352787a4d70a4cb501c62"
34+
"7": "7776338341cb8ddf4b8f4516b579d06ac47d224c5f0451e4ceb4172897a45c66"
3535
- name: centos-6.5
3636
driver_config:
3737
box: opscode-centos-6.5
@@ -46,7 +46,7 @@ platforms:
4646
package:
4747
checksum:
4848
centos:
49-
"6": "62a17575fc0d560183a05cfde202085b9d87e0c8a0e892b5ad471139f18c6332"
49+
"6": "a7a31a69e450b6fa259dbbb167a44b1ca30af775107345040226cc54b7f88dcb"
5050
- name: centos-5.10
5151
driver_config:
5252
box: opscode-centos-5.10
@@ -61,7 +61,7 @@ platforms:
6161
package:
6262
checksum:
6363
centos:
64-
"5": "9381a2fcc8ba5a8673c7d56f33635fe41f3735df455c02d3f6e66b28c3f9ad4d"
64+
"5": "72541e1a52a6ce78a5fffce80f7a65ef6e339c99b2c81e350e203e128c36ae38"
6565
suites:
6666
- name: default
6767
run_list:
@@ -72,7 +72,7 @@ suites:
7272
package:
7373
version:
7474
minor: 4
75-
incremental: 6
75+
incremental: 7
7676
- name: default13
7777
run_list:
7878
- recipe[minitest-handler]
@@ -102,7 +102,7 @@ suites:
102102
package:
103103
version:
104104
minor: 4
105-
incremental: 6
105+
incremental: 7
106106
enterprise_key: <%= (ENV["RIAK_ENTERPRISE_KEY"].nil? ? "" : ENV["RIAK_ENTERPRISE_KEY"]) %>
107107
- name: enterprise13
108108
run_list:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## v2.4.4:
2+
3+
* Riak `1.4.7` is now the default.
4+
15
## v2.4.3:
26

37
* Add a constraint to `yum` cookbook dependency so that breaking changes in

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ node['riak']['install_method'] = "package"
2828
# package.rb
2929
node['riak']['package']['version']['major'] = "1"
3030
node['riak']['package']['version']['minor'] = "4"
31-
node['riak']['package']['version']['incremental'] = "6"
31+
node['riak']['package']['version']['incremental'] = "7"
3232
```
3333

3434
If you are installing Riak Enterprise with the `custom_repository` method,

attributes/default.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class ::Array
105105
default['riak']['config']['riak_kv']['vnode_vclocks'] = true
106106
default['riak']['config']['riak_kv']['listkeys_backpressure'] = true
107107
default['riak']['config']['riak_kv']['fsm_limit'] = 50000
108+
#default['riak']['config']['riak_kv']['secondary_index_sort_default'] = true
108109
default['riak']['config']['riak_kv']['object_format'] = "v1"
109110

110111
# riak_kv storage_backend

attributes/package.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
default['riak']['package']['url'] = "http://s3.amazonaws.com/downloads.basho.com/riak"
2323
default['riak']['package']['version']['major'] = "1"
2424
default['riak']['package']['version']['minor'] = "4"
25-
default['riak']['package']['version']['incremental'] = "6"
25+
default['riak']['package']['version']['incremental'] = "7"
2626
default['riak']['package']['version']['build'] = "1"
2727
default['riak']['package']['config_dir'] = "/etc/riak"
2828
default['riak']['package']['local_package'] = false

attributes/source.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
default['riak']['source']['url'] = "http://s3.amazonaws.com/downloads.basho.com/riak"
2020
default['riak']['source']['version']['major'] = "1"
2121
default['riak']['source']['version']['minor'] = "4"
22-
default['riak']['source']['version']['incremental'] = "6"
22+
default['riak']['source']['version']['incremental'] = "7"
2323
default['riak']['source']['prefix'] = "/usr/local"
2424
default['riak']['source']['config_dir'] = node['riak']['source']['prefix'] + "/riak/etc"
2525

0 commit comments

Comments
 (0)