Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos.core
Commits
87dc2525
Commit
87dc2525
authored
Jul 23, 2021
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert libslap changes
parent
6c0bd7dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
master/bt5/slapos_accounting/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSAccounting.py
...Item/portal_components/extension.erp5.SlapOSAccounting.py
+1
-1
master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py
...onentTemplateItem/portal_components/tool.erp5.SlapTool.py
+1
-1
No files found.
master/bt5/slapos_accounting/ExtensionTemplateItem/portal_components/extension.erp5.SlapOSAccounting.py
View file @
87dc2525
...
...
@@ -38,7 +38,7 @@ def ComputeNodeConsumptionTioXMLFile_parseXml(self, REQUEST=None):
compute_node_consumption_model
=
\
pkg_resources
.
resource_string
(
'slapos.slap'
,
'doc/compute
_node
_consumption.xsd'
)
'slapos.slap'
,
'doc/compute
r
_consumption.xsd'
)
# Validate against the xsd
xsd_model
=
StringIO
.
StringIO
(
compute_node_consumption_model
)
...
...
master/bt5/slapos_slap_tool/ToolComponentTemplateItem/portal_components/tool.erp5.SlapTool.py
View file @
87dc2525
...
...
@@ -746,7 +746,7 @@ class SlapTool(BaseTool):
compute_node_consumption_model
=
\
pkg_resources
.
resource_string
(
'slapos.slap'
,
'doc/compute
_node
_consumption.xsd'
)
'doc/compute
r
_consumption.xsd'
)
if
self
.
_validateXML
(
use_string
,
compute_node_consumption_model
):
compute_node
=
self
.
_getComputeNodeDocument
(
compute_node_id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment