Thomas S Hatch
a89d11d929
Merge pull request #5273 from virtua-network/vmadm
...
modules/smartos_vmadm : add _gen_zone_json(**kwargs) function
2013-05-27 20:45:54 -07:00
Thomas S Hatch
d961bc94f5
Merge pull request #5267 from robertkeizer/func-alias
...
Function aliases for 'list' in modules.
2013-05-27 20:42:27 -07:00
Thomas S Hatch
238393f8aa
Merge pull request #5261 from aboe76/archlinux-git-package
...
Updated salt-git package with new features
2013-05-27 20:16:54 -07:00
Thomas S Hatch
27118f77f2
Merge pull request #5258 from mgwilliams/virt
...
modules/virt.py: use qemu-img to detect image type; allow emulator type ...
2013-05-27 20:06:41 -07:00
Thomas S Hatch
93ceb61709
Merge branch 'develop' of git://github.com/iMilnb/saltstack into iMilnb-develop
...
Conflicts:
salt/modules/xapi.py
2013-05-28 02:59:04 +00:00
Robert Keizer
4e47287af7
Exiting as 0 now. Also added debug to show valid command list.
2013-05-27 20:56:33 -05:00
Robert Keizer
17c4f5a988
Starting to dynamically generate functions
2013-05-27 20:43:55 -05:00
Robert Keizer
0e6b99245f
Typo's and importing re.
2013-05-27 20:34:33 -05:00
Robert Keizer
55f93f1b18
Woops. Forgot to remove that.
2013-05-27 20:28:42 -05:00
Robert Keizer
d42d03baa2
Working on available commands.
2013-05-27 20:26:44 -05:00
Robert Keizer
b4682d6b5e
Removed restriction on operating system. Also renamed to zfs.list
2013-05-27 20:03:18 -05:00
Robert Keizer
9b36dbd729
Typo. Thanks s0undt3ch.
2013-05-27 16:58:44 -05:00
mguegan
7abfeb9e79
modules/smartos_vmadm : Fix an incorrect variable
2013-05-27 22:42:32 +02:00
mguegan
7b831fd500
modules/smartos_vmadm : add _gen_zone_json(**kwargs) function
...
_gen_zone_json(**kwargs) will be needed as a template for Zone
creation (aka. OS virtualization). For the moment, only the mandatory
arguments are used.
2013-05-27 22:37:40 +02:00
Thomas S Hatch
31c6045b01
Add vars reference document. Fix #5220
2013-05-27 18:48:21 +00:00
Thomas S Hatch
8bcd64ece9
Fix for #4920 , needs to confirm
2013-05-27 17:08:16 +00:00
Colton Myers
b409b4f6a5
Import both for completeness
...
Importing `salt.util.winapi` does import `salt.util` as well. However,
having both explicitly shows that both are being used, and matches the
pattern we use elsewhere. Additionally, as far as I know it doesn't
have any real performance costs, as it doesn't reimport `salt.utils` if
it's already loaded.
2013-05-27 11:04:33 -06:00
Colton Myers
5d4b27371f
Merge pull request #5263 from mprymek/fix-winapi-import
...
Import salt.utils.winapi
2013-05-27 09:59:58 -07:00
Thomas S Hatch
fb3f9cdf98
Merge pull request #5212 from faust/gentoo-webrsync
...
Added fall back to "webrsync" in case of failure of "rsync" Portage synchronization and GPG support.
2013-05-27 09:12:49 -07:00
Thomas S Hatch
21a2ea7cb3
Fix #5218
2013-05-27 09:59:42 -06:00
Thomas S Hatch
766a115e94
Merge branch 'develop' of github.com:saltstack/salt into develop
2013-05-27 09:29:46 -06:00
Pedro Algarvio
edd056605c
Merge pull request #5268 from basepi/argcleanup
...
Use yamlify_arg() in more places
2013-05-27 06:42:49 -07:00
Pedro Algarvio
fe63869311
Typo.
2013-05-27 11:11:49 +01:00
Robert Keizer
6c2180628b
rvm function alias.
2013-05-26 22:40:37 -05:00
Robert Keizer
b539f9e36f
pip function alias
2013-05-26 22:39:43 -05:00
Robert Keizer
a92c71939e
pecl function alias
2013-05-26 22:38:52 -05:00
Robert Keizer
50598514b5
nzbget function alias
2013-05-26 22:38:22 -05:00
Robert Keizer
6d0e9bb058
Match module function alias.
2013-05-26 22:37:45 -05:00
Robert Keizer
b94841ab64
Gem function alias
2013-05-26 22:37:03 -05:00
Robert Keizer
f1798c842d
Nova built-in function alias
2013-05-26 22:36:01 -05:00
Robert Keizer
3c2e7635c0
npm function alias.
2013-05-26 22:32:43 -05:00
Joseph Hall
0596dae7ef
Merge pull request #5264 from virtua-network/timezone
...
module/timezone : add Solaris family support
2013-05-26 12:45:24 -07:00
mguegan
641d466e70
Pull #5264 : get rid of re.match as @cvrebert pointed out
2013-05-26 21:00:20 +02:00
David Boucha
5903c88ba3
Merge pull request #5265 from robertkeizer/couchdb
...
Couchdb Returner
2013-05-26 11:23:37 -07:00
Robert Keizer
7304ff0619
Old import time line.
2013-05-26 12:47:42 -05:00
Robert Keizer
e64e920826
Some comments. Also removed some debug lines.
2013-05-26 12:28:45 -05:00
Robert Keizer
9fb4706c5d
Removed create_db. Also added some debug lines.
2013-05-26 12:21:31 -05:00
mguegan
6c30708cb5
module/timezone : add Solaris family support
...
This commit will add the support of TZ for Solaris platforms.
Tested with SmartOS
2013-05-26 18:51:33 +02:00
Thomas S Hatch
c4c2b7936a
Add tests for mine.send
2013-05-26 08:55:18 -06:00
Thomas S Hatch
a8f47b87e4
mine.send is working!
2013-05-26 08:54:55 -06:00
Thomas S Hatch
e00a7c45ba
Catch case where format_call stack traces and the trace is safe
2013-05-26 08:53:02 -06:00
Robert Keizer
e1e24337fe
Cleaner re-write.
2013-05-26 09:50:21 -05:00
Robert Keizer
26e874c9dc
Working default with some evals
2013-05-26 09:38:19 -05:00
Miroslav Prymek
3d8da0897b
Import salt.utils.winapi
2013-05-26 16:30:29 +02:00
Thomas S Hatch
f1640d263c
Update mine.send to parse args and kwargs more salty
2013-05-26 08:19:22 -06:00
Robert Keizer
d8187c1400
Working on custom options.
2013-05-26 09:01:13 -05:00
David Boucha
9312d5be04
add missing docstring
2013-05-26 08:43:41 -05:00
Thomas S Hatch
c9f108b787
Make mine.update return True when finished
2013-05-26 07:19:02 -06:00
Thomas S Hatch
49db655fd5
Add master side capability to make mine accept single funcs
2013-05-26 07:18:12 -06:00
Thomas S Hatch
d48702aaa5
Add mine_functions to grains
2013-05-26 06:59:13 -06:00
