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
0
Merge Requests
0
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
Titouan Soulard
slapos.core
Commits
598d2167
Commit
598d2167
authored
Mar 09, 2012
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into versionoso
Conflicts: master/bt5/vifib_slap/bt/revision
parents
2aaf74a2
35d31cf8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
12 deletions
+12
-12
master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_bangSoftwareInstanceTree.xml
...low/scripts/SoftwareInstance_bangSoftwareInstanceTree.xml
+1
-1
master/bt5/vifib_base/bt/revision
master/bt5/vifib_base/bt/revision
+1
-1
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Delivery_fixConsistency.xml
...raction_workflow/interactions/Delivery_fixConsistency.xml
+4
-4
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/SoftwareInstance_fixConsistency.xml
...workflow/interactions/SoftwareInstance_fixConsistency.xml
+4
-4
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInstance_fixConsistency.xml
...tion_workflow/scripts/SoftwareInstance_fixConsistency.xml
+1
-1
master/bt5/vifib_slap/bt/revision
master/bt5/vifib_slap/bt/revision
+1
-1
No files found.
master/bt5/vifib_base/WorkflowTemplateItem/portal_workflow/software_instance_slap_interface_workflow/scripts/SoftwareInstance_bangSoftwareInstanceTree.xml
View file @
598d2167
...
@@ -55,7 +55,7 @@ portal = software_instance.getPortalObject()\n
...
@@ -55,7 +55,7 @@ portal = software_instance.getPortalObject()\n
\n
\n
root_hosting_subscription = portal.portal_catalog.getResultValue(uid=software_instance.SoftwareInstance_getRootHostingSubscriptionUid())\n
root_hosting_subscription = portal.portal_catalog.getResultValue(uid=software_instance.SoftwareInstance_getRootHostingSubscriptionUid())\n
tag = \'%s_%s_inProgress\' % (software_instance.getUid(), root_hosting_subscription.getTitle())\n
tag = \'%s_%s_inProgress\' % (software_instance.getUid(), root_hosting_subscription.getTitle())\n
root_software_instance = root_hosting_subscription.
HostingSubscription_requestRootSoftwareInstance(tag
)\n
root_software_instance = root_hosting_subscription.
getPredecessorValue(
)\n
\n
\n
# Use iterative algorithm instead of recursive approach in order to avoid\n
# Use iterative algorithm instead of recursive approach in order to avoid\n
# complexity as much as possible.\n
# complexity as much as possible.\n
...
...
master/bt5/vifib_base/bt/revision
View file @
598d2167
410
411
\ No newline at end of file
\ No newline at end of file
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/Delivery_fixConsistency.xml
View file @
598d2167
...
@@ -27,15 +27,15 @@
...
@@ -27,15 +27,15 @@
<item>
<item>
<key>
<string>
after_script_name
</string>
</key>
<key>
<string>
after_script_name
</string>
</key>
<value>
<value>
<list>
<tuple/>
<string>
Delivery_fixConsistency
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
before_commit_script_name
</string>
</key>
<key>
<string>
before_commit_script_name
</string>
</key>
<value>
<value>
<tuple/>
<list>
<string>
Delivery_fixConsistency
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/interactions/SoftwareInstance_fixConsistency.xml
View file @
598d2167
...
@@ -27,15 +27,15 @@
...
@@ -27,15 +27,15 @@
<item>
<item>
<key>
<string>
after_script_name
</string>
</key>
<key>
<string>
after_script_name
</string>
</key>
<value>
<value>
<list>
<tuple/>
<string>
SoftwareInstnace_fixConsistency
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
before_commit_script_name
</string>
</key>
<key>
<string>
before_commit_script_name
</string>
</key>
<value>
<value>
<tuple/>
<list>
<string>
SoftwareInstance_fixConsistency
</string>
</list>
</value>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInst
na
ce_fixConsistency.xml
→
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SoftwareInst
an
ce_fixConsistency.xml
View file @
598d2167
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
<value>
<string>
SoftwareInst
na
ce_fixConsistency
</string>
</value>
<value>
<string>
SoftwareInst
an
ce_fixConsistency
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
master/bt5/vifib_slap/bt/revision
View file @
598d2167
619
620
\ No newline at end of file
\ No newline at end of file
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