Commit 2b90fc01 authored by Tomáš Peterka's avatar Tomáš Peterka

Merge remote-tracking branch 'origin/master' into amarisoft

Conflicts:
	slapos/tests/slapformat.py
parents d393206c 889711ed
...@@ -47,11 +47,11 @@ documentation. ...@@ -47,11 +47,11 @@ documentation.
This allows to request instances in a few words, i.e:: 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 :: 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" is an instance of the SLAP library. It is only used for advanced usages.
"slap" instance is obtained by doing :: "slap" instance is obtained by doing ::
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment