xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 09:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into firwareUpdateServer

Browse Source
This commit is contained in:
Tinashe Kucherera 2024-09-12 11:44:22 -04:00 committed by GitHub
commit 5609d4fe4b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
confluent_server/confluent/core.py
View File

@ -163,7 +163,7 @@ def _merge_dict(original, custom):
rootcollections = ['deployment/', 'discovery/', 'events/', 'networking/',
'noderange/', 'nodes/', 'nodegroups/', 'storage/', 'usergroups/' ,
'noderange/', 'nodes/', 'nodegroups/', 'storage/', 'usergroups/',
'users/', 'uuid', 'version', 'staging/']

1
confluent_server/confluent/httpapi.py
View File

@ -936,6 +936,7 @@ def resourcehandler_backend(env, start_response):
yield rsp
return
elif (operation == 'create' and ('/firmware/updates/active' in env['PATH_INFO'])):
url = env['PATH_INFO']
if 'application/json' in reqtype: