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
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
2b90fc01
Commit
2b90fc01
authored
Jun 02, 2017
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into amarisoft
Conflicts: slapos/tests/slapformat.py
parents
d393206c
889711ed
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
41 deletions
+67
-41
slapos/README.console.txt
slapos/README.console.txt
+2
-2
slapos/tests/slapformat.py
slapos/tests/slapformat.py
+65
-39
No files found.
slapos/README.console.txt
View file @
2b90fc01
...
...
@@ -47,11 +47,11 @@ documentation.
This allows to request instances in a few words, i.e::
request("
mykvm", "http://www.url.com/path/to/current/best/known/kvm/software.cfg
")
request("
http://www.url.com/path/to/current/best/known/kvm/software.cfg", "mykvm
")
can be simplified into ::
request(
"mykvm", product.kvm
)
request(
product.kvm, "mykvm"
)
* "slap" is an instance of the SLAP library. It is only used for advanced usages.
"slap" instance is obtained by doing ::
...
...
slapos/tests/slapformat.py
View file @
2b90fc01
This diff is collapsed.
Click to expand it.
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