Lv Jiawei
372de0c342
Update neutron.py
2015-12-17 12:33:07 +08:00
Lv Jiawei
656303a3d9
Update neutron.py
2015-12-17 11:02:01 +08:00
Lvjiawei
111c321d21
Summary: Add a neutron api about update a firewall rule.
...
Description:
Add a function update_firewall_rule in salt/modules/neutron.py
Add a object function update_firewall_rule in salt/modules/neutron.py
2015-12-17 10:34:03 +08:00
Nicole Thomas
cb10aad1b3
Merge pull request #29774 from cachedout/splay_jenkins
...
Splay sleeps inside jenkins
2015-12-16 16:55:53 -07:00
Mike Place
8c6aa66662
Merge pull request #29759 from slav0nic/patch-1
...
Fix #25930
2015-12-16 15:09:56 -07:00
Mike Place
dc2538a3cc
Merge pull request #29761 from abednarik/virtual_ret_win_file_module
...
modules.win_file: __virtual__ return err msg.
2015-12-16 15:07:06 -07:00
Mike Place
fdf0b53eb1
Merge pull request #29762 from abednarik/virtual_ret_win_dns_client_module
...
modules.win_dns_client: __virtual__ return err msg.
2015-12-16 15:06:56 -07:00
Mike Place
b60b804d83
Merge pull request #29760 from abednarik/virtual_ret_win_firewall_module
...
modules.win_firewall: __virtual__ return err msg.
2015-12-16 15:06:46 -07:00
Mike Place
7e76cd6ef3
Merge pull request #29763 from abednarik/virtual_ret_win_disk_module
...
modules.win_disk: __virtual__ return err msg.
2015-12-16 15:06:39 -07:00
Mike Place
6bb1c12777
Merge pull request #29769 from pass-by-value/gce_scopes_doc
...
Add documentation about scopes (GCE)
2015-12-16 15:06:24 -07:00
Mike Place
1c65cdcbc4
Splay sleeps inside jenkins
2015-12-16 14:48:51 -07:00
Mike Place
613213b921
Merge pull request #29757 from cachedout/refresh_db
...
Skip refresh db test if upstream repo does not repsond.
2015-12-16 13:23:16 -07:00
Aditya Kulkarni
ae5fbe9046
Add documentation about scopes (GCE)
2015-12-16 15:21:51 -05:00
abednarik
579eceaf6e
modules.win_disk: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 15:14:13 -03:00
abednarik
c0cd74b73b
modules.win_dns_client: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 15:11:00 -03:00
abednarik
44619b33ee
modules.win_file: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 15:09:14 -03:00
abednarik
cb41bc1f1b
modules.win_firewall: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 15:05:25 -03:00
Sergey Maranchuk
ad684f2648
Fix #25930
2015-12-16 19:49:44 +02:00
Mike Place
83df4c4c75
Skip refresh db test if upstream repo does not repsond.
2015-12-16 10:23:10 -07:00
Mike Place
4ba736d358
Merge pull request #29658 from MIBc/virt_ret
...
Summary: Add two neutron api about listing and showing firewall.
2015-12-16 07:53:50 -07:00
Mike Place
5a32fbc251
Merge pull request #29712 from techhat/mksls
...
Add genesis.mksls
2015-12-16 07:52:00 -07:00
Mike Place
aab929d196
Merge pull request #29718 from thusoy/issue-29423
...
Support match-sets in iptables module
2015-12-16 07:48:18 -07:00
Mike Place
2b9e74554c
Merge pull request #29719 from gqgunhed/gqgunhed-patch
...
fixed: include all items from kern.disks split
2015-12-16 07:47:02 -07:00
Mike Place
6191c2f4a8
Merge pull request #29734 from Granjow/masterless-config
...
Doc update on masterless mode: Move master config to minion config
2015-12-16 07:42:30 -07:00
Mike Place
0befb237ef
Merge pull request #29738 from kiorky/fixpkg
...
Retrocompat fix for #29735 : pkg.latest/wait
2015-12-16 07:41:42 -07:00
Mike Place
5690863d4f
Merge pull request #29739 from abednarik/virtual_ret_win_service_module
...
modules.win_service: __virtual__ return err msg.
2015-12-16 07:40:45 -07:00
Mike Place
235435661d
Merge pull request #29744 from kiorky/vgname
...
Fix #29742 : vgname is lost in the middle
2015-12-16 07:39:59 -07:00
Mike Place
98b8cc2b56
Merge pull request #29740 from kiorky/fixgit
...
Type mess in git.latest
2015-12-16 07:39:43 -07:00
Mike Place
2e911760de
Merge pull request #29746 from abednarik/virtual_ret_win_path_module
...
modules.win_path: __virtual__ return err msg.
2015-12-16 07:39:20 -07:00
Mike Place
c477c32736
Merge pull request #29747 from abednarik/virtual_ret_win_ntp_module
...
modules.win_ntp: __virtual__ return err msg.
2015-12-16 07:39:10 -07:00
Mike Place
fb487c9011
Merge pull request #29748 from abednarik/virtual_ret_win_network_module
...
modules.win_network: __virtual__ return err msg.
2015-12-16 07:38:59 -07:00
Mike Place
4470aefd90
Merge pull request #29749 from abednarik/virtual_ret_win_ip_module
...
modules.win_ip: __virtual__ return err msg.
2015-12-16 07:38:48 -07:00
Mike Place
cae625f818
Merge pull request #29750 from abednarik/virtual_ret_win_groupadd_module
...
modules.win_groupadd: __virtual__ return err msg.
2015-12-16 07:38:30 -07:00
Mike Place
be3c86c4c0
Merge pull request #29745 from abednarik/virtual_ret_win_pkg_module
...
modules.win_pkg: __virtual__ return err msg.
2015-12-16 07:38:06 -07:00
abednarik
23362e8b53
modules.win_groupadd: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:06:02 -03:00
abednarik
068de3d561
modules.win_ip: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:03:19 -03:00
abednarik
fb95e2b7cd
modules.win_network: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 10:01:45 -03:00
abednarik
bf958b2b1f
modules.win_ntp: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:58:59 -03:00
abednarik
21e3186e01
modules.win_path: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:56:31 -03:00
abednarik
9cf4b4670e
modules.win_pkg: __virtual__ return err msg.
...
Updated message when return False on __virtual__ when system is not Windows.
2015-12-16 09:54:10 -03:00
Mathieu Le Marec - Pasquet
b25b34474a
Fix #29742 : vgname is lost in the middle
2015-12-16 13:42:27 +01:00
Mathieu Le Marec - Pasquet
3c4185f806
Type mess in git.latest
...
Did not get why, but we can have a list of comments instead of stings.
This fixes:
```
line 107, in _uptodate\n ret['comment'] += '\\n\\nChanges made: ' + comments\nTypeError:
cannot concatenate 'str' and 'list' objects\n"
duration: 366.804
name: https://github.com/makinacorpus/makina-states.git
result: false
```
2015-12-16 12:59:55 +01:00
abednarik
8f4f5b3361
modules.win_service: __virtual__ return err msg.
...
Updated messafe when return Falso on __virtual__ when system is not Windows.
2015-12-16 08:31:37 -03:00
Mathieu Le Marec - Pasquet
944a80cc2a
Retrocompat fix for #29735 : pkg.latest/wait
...
This refs & fix salstack/salt#29735
2015-12-16 11:31:07 +00:00
Simon A. Eugster
0ca82f27b8
Doc update on masterless mode: Move master config to minion config
2015-12-16 10:59:14 +01:00
Lv Jiawei
49a2d6fc0a
Update neutron.py
2015-12-16 09:27:57 +08:00
Tarjei Husøy
387ac2ce5e
Support match-sets in iptables module
...
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426 .
Added tests and fixed incorrect appending of the built rule.
Closes #29423 .
2015-12-15 16:35:06 -08:00
Mike Place
f1e1b31c82
Merge pull request #29728 from pzipoy/dev/pzipoy/windows_dropfile_exist
...
Check for windows dropfile existence
2015-12-15 16:58:28 -07:00
Mike Place
2b06b22e33
Merge pull request #29717 from jraby/patch-1
...
Document syslog facility format and default value
2015-12-15 16:04:13 -07:00
Mike Place
31e195dd68
Merge pull request #29720 from s-sebastian/develop
...
Remove humanname from yum repository options
2015-12-15 16:01:54 -07:00