Update git submodules
* Update sahara from branch 'master' to 67a56de970d664b49d5178bdca637b53dd2f380e - Merge "Bump oslo.* and pbr version to support >=py38" - Bump oslo.* and pbr version to support >=py38 In zed cycle, OpenStack projects and oslo lib has dropped the py3.6 and py3.7 support - https://governance.openstack.org/tc/reference/runtimes/zed.html I also decrepated oslo-log < 5.0.0, so we should bump oslo.log>=5.0.0. Because of oslo.log>=5.0.0 depends on oslo.i18n>=3.20.0 as below, so we also need to upgrade oslo.i18n. The conflict is caused by: The user requested oslo.i18n>=3.15.3 python-saharaclient 1.4.0 depends on oslo.i18n>=3.15.3 castellan 0.16.0 depends on oslo.i18n>=3.15.3 keystonemiddleware 4.17.0 depends on oslo.i18n!=3.15.2 and >=2.1.0 oslo-config 6.8.0 depends on oslo.i18n>=3.15.3 oslo-concurrency 3.26.0 depends on oslo.i18n>=3.15.3 oslo-db 6.0.0 depends on oslo.i18n>=3.15.3 oslo-log 5.0.0 depends on oslo.i18n>=3.20.0 The user requested (constraint) oslo-i18n==3.15.3 The conflict is caused by: The user requested pbr!=2.1.0 and >=2.0.0 bashate 0.5.1 depends on pbr>=1.6 fixtures 3.0.0 depends on pbr>=0.11 stestr 1.0.0 depends on pbr!=2.1.0 and >=2.0.0 testresources 2.0.0 depends on pbr>=1.8 testtools 2.4.0 depends on pbr>=0.11 python-saharaclient 1.4.0 depends on pbr!=2.1.0 and >=2.0.0 castellan 0.16.0 depends on pbr!=2.1.0 and >=2.0.0 keystoneauth1 3.4.0 depends on pbr!=2.1.0 and >=2.0.0 keystonemiddleware 4.17.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-concurrency 3.26.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-context 2.22.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-db 6.0.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-i18n 3.20.0 depends on pbr!=2.1.0 and >=2.0.0 oslo-log 5.0.0 depends on pbr>=3.1.1 The user requested (constraint) pbr==2.0.0 The conflict is caused by: The user requested oslo.serialization!=2.19.1 and >=2.18.0 python-saharaclient 1.4.0 depends on oslo.serialization!=2.19.1 and >=2.18.0 keystonemiddleware 4.17.0 depends on oslo.serialization!=2.19.1 and >=1.10.0 oslo-log 5.0.0 depends on oslo.serialization>=2.25.0 The user requested (constraint) oslo-serialization==2.18.0 Change-Id: I117657e9861a55a751522dba3e3b1e75a22f9711
This commit is contained in:
parent
0be498146b
commit
4943421c43
2
sahara
2
sahara
|
@ -1 +1 @@
|
|||
Subproject commit 2d5a65a24bf3420367a4d1b6c2d2fcf8a672acf6
|
||||
Subproject commit 67a56de970d664b49d5178bdca637b53dd2f380e
|
Loading…
Reference in New Issue