diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 08:19:09 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-27 08:19:09 -0400 |
| commit | 317d3087459538877100032733477362f456f550 (patch) | |
| tree | 27fabdff3649c75bcdd9de8ccde5c5826c679e5e /schemas | |
| parent | 9d5e8170292e17d3b087878918562dcf502f70d4 (diff) | |
| parent | a519dc9298317b678bca43597892df5aa13d874d (diff) | |
| download | bcfg2-317d3087459538877100032733477362f456f550.tar.gz bcfg2-317d3087459538877100032733477362f456f550.tar.bz2 bcfg2-317d3087459538877100032733477362f456f550.zip | |
Merge branch 'maint'
Conflicts:
doc/server/plugins/generators/cfg.txt
doc/server/plugins/generators/tcheetah.txt
src/lib/Bcfg2/Server/Admin/Xcmd.py
src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
Diffstat (limited to 'schemas')
| -rw-r--r-- | schemas/types.xsd | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/schemas/types.xsd b/schemas/types.xsd index 81b1e3927..dbb0c0390 100644 --- a/schemas/types.xsd +++ b/schemas/types.xsd @@ -119,14 +119,14 @@ </xsd:documentation> </xsd:annotation> - <xsd:attribute type='ActionTimingEnum' name='timing' use='required'> + <xsd:attribute type='ActionTimingEnum' name='timing'> <xsd:annotation> <xsd:documentation> When the action is run. </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute type='ActionWhenEnum' name='when' use='required'> + <xsd:attribute type='ActionWhenEnum' name='when'> <xsd:annotation> <xsd:documentation> If the action is always run, or is only run when a bundle @@ -136,7 +136,7 @@ </xsd:documentation> </xsd:annotation> </xsd:attribute> - <xsd:attribute type='ActionStatusEnum' name='status' use='required'> + <xsd:attribute type='ActionStatusEnum' name='status'> <xsd:annotation> <xsd:documentation> Whether or not to check the return code of the action. If @@ -162,8 +162,16 @@ <xsd:attribute type='xsd:string' name='command' use='required'> <xsd:annotation> <xsd:documentation> - The command to run. The command is executed within a shell, - so flow control and other shell-specific things can be used. + The command to run. + </xsd:documentation> + </xsd:annotation> + </xsd:attribute> + <xsd:attribute type='xsd:boolean' name='shell'> + <xsd:annotation> + <xsd:documentation> + Whether the command string should be executeed within a shell. + If enabled flow control and other shell-specific things can + be used. </xsd:documentation> </xsd:annotation> </xsd:attribute> |