Skip to content

Commit 26741cd

Browse files
authored
Merge branch 'master' into pack-config-additionalproperties
2 parents b7672ed + 4519fa8 commit 26741cd

File tree

6 files changed

+8
-0
lines changed

6 files changed

+8
-0
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Added
4242

4343
Contributed by @Kami.
4444

45+
* Make redis the default coordinator backend.
46+
4547
* Fix a bug in the pack config loader so that objects covered by an additionalProperties schema
4648
can use encrypted datastore keys and have their default values applied correctly. #5225
4749

conf/st2.dev.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ protocol = udp
8787
# / cross server functionality
8888
#url = redis://localhost
8989
#url = kazoo://localhost
90+
url = redis://127.0.0.1:6379
9091

9192
[webui]
9293
# webui_base_url = https://mywebhost.domain

fixed-requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ python-keyczar==0.716
3737
pytz==2021.1
3838
pywinrm==0.3.0
3939
pyyaml==5.4
40+
redis==3.5.3
4041
requests[security]==2.25.1
4142
retrying==1.3.3
4243
routes==2.4.1

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ python-statsd==2.1.0
5353
pytz==2021.1
5454
pywinrm==0.3.0
5555
pyyaml==5.4
56+
redis==3.5.3
5657
rednose
5758
requests[security]==2.25.1
5859
retrying==1.3.3

st2common/in-requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ tooz
2525
# Required by tooz - on new versions of tooz, all the backend dependencies need
2626
# to be installed manually
2727
zake
28+
# default coordinator backend configured for tooz
29+
redis
2830
routes
2931
flex
3032
webob

st2common/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ pymongo==3.11.3
3030
python-dateutil==2.8.1
3131
python-statsd==2.1.0
3232
pyyaml==5.4
33+
redis==3.5.3
3334
requests[security]==2.25.1
3435
retrying==1.3.3
3536
routes==2.4.1

0 commit comments

Comments
 (0)