Colton Myers
615d3ec219
Merge branch 'fixws' of git://github.com/efficks/salt into efficks-fixws
2015-08-25 14:06:54 -06:00
François-Xavier Choinière
8d9785d718
Fix function spacing
2015-08-25 13:39:12 -04:00
François-Xavier Choinière
233774623e
Fix detection of powershell in win_service module.
2015-08-25 13:00:44 -04:00
Justin Findlay
859801f2b6
Merge pull request #26564 from lyft/add-netaddress-module
...
Add netaddress module for getting info about IP networks
2015-08-25 10:38:27 -06:00
Justin Findlay
d073ac45ec
Merge pull request #26623 from terminalmage/zh107
...
Remove raw string formatting in doc/, salt/auth/, and salt/cloud/
2015-08-25 10:04:11 -06:00
Pedro Algarvio
226ef73863
Merge pull request #26609 from s0undt3ch/develop
...
Allow supplying an alternate mod_dict class
2015-08-25 01:02:02 +01:00
Erik Johnson
9051706b64
Remove raw string formatting in doc/, salt/auth/, and salt/cloud/
2015-08-24 17:48:10 -05:00
Pedro Algarvio
881f2d7431
Allow supplying an alternate mod_dict class
2015-08-24 17:43:57 +01:00
Pedro Algarvio
579c786e94
Merge pull request #26590 from s0undt3ch/develop
...
`__pillar__` can be a boolean, don't assume it's a `dict`.
2015-08-24 17:43:29 +01:00
Pedro Algarvio
92c313b8f2
__pillar__ can be a boolean, don't assume it's a dict.
...
Fixes #26559
2015-08-23 09:12:28 +01:00
Pedro Algarvio
b4e096a57b
Merge pull request #26597 from thatch45/minmods
...
Add static_loader option to minion mods
2015-08-23 08:16:22 +01:00
Thomas S Hatch
8cb7b88f9b
Add static_loader option to minion mods
2015-08-22 21:48:13 -06:00
Thomas S Hatch
9b98ece021
Merge pull request #26594 from thatch45/statloader
...
Allow the loader to embed standard python modules
2015-08-22 19:42:15 -06:00
Pedro Algarvio
666108df17
Merge pull request #26578 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-08-23 00:14:07 +01:00
Thomas S Hatch
da62361317
fix issue with redirecting the wrong object in the load loop
2015-08-22 15:05:00 -06:00
Thomas S Hatch
7de48e3d31
works!
2015-08-22 12:15:36 -06:00
Thomas S Hatch
c72b598cf6
doh! higher level :)
2015-08-22 10:53:34 -06:00
Thomas S Hatch
c79d81bea1
initial static_modules support
2015-08-22 10:41:58 -06:00
Justin Findlay
82b2633dc7
Merge pull request #26589 from hatchery/develop
...
Give MacOS an 'os_family' grain
2015-08-22 10:00:26 -06:00
Thomas S Hatch
0faa375d31
Merge pull request #26586 from gtmanfred/develop
...
reinit crypto like in #23825
2015-08-22 09:45:58 -06:00
David J. Felix
bf44ac1257
Give MacOS an 'os_family' grain
...
- MacOS seemed to be the only OS without an os_family named.
- Formulas based on os_family for cross platform were unnecessarily difficult because of this.
2015-08-22 10:19:16 -04:00
Daniel Wallace
57e25c1940
reinit crypto like in #23825
...
Without this, salt-cloud fails when running using cloud.profile in a
reactor. so does runnerclient.cmd('cloud.profile').
2015-08-22 04:46:00 -05:00
Ryan Lane
891c4e8b11
Python3 compat fix
2015-08-21 16:19:23 -07:00
Colton Myers
75f48b4a96
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/topics/targeting/grains.rst
2015-08-21 16:48:48 -06:00
Colton Myers
fe2d09e3ad
Merge pull request #26530 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-21 16:38:57 -06:00
Colton Myers
55ecff1278
Merge branch 'merge-forward-2015.8' of https://github.com/basepi/salt into basepi-merge-forward-2015.8
...
Conflicts:
salt/utils/event.py
2015-08-21 16:37:24 -06:00
Nicole Thomas
34e663230f
Merge pull request #26570 from cachedout/fix_haproxy_docs
...
Fix haproxy docs to be valid
2015-08-21 15:38:34 -06:00
Ryan Lane
0e0c2246c4
Remove debugging code
2015-08-21 14:38:05 -07:00
Jenkins
3710b0bc7d
Fix haproxy docs to be valid
2015-08-21 15:15:19 -06:00
Colton Myers
e362d003f5
Fix the git test (again)
2015-08-21 14:21:42 -06:00
Ryan Lane
c81e398da6
Updated versionadded
2015-08-21 13:05:05 -07:00
Ryan Lane
241c76d60a
Add netaddress module for getting info about IP networks
2015-08-21 12:15:11 -07:00
Mike Place
fb5b2d09f9
Merge pull request #26562 from cachedout/fix_systemd_detect_suprious
...
Fix suprious error message with systemd-detect
2015-08-21 12:58:46 -06:00
Jenkins
4da1c0ad87
Fix suprious error message with systemd-detect
2015-08-21 12:58:05 -06:00
Justin Findlay
da65e60957
Merge pull request #26557 from jfindlay/range
...
add docs to #26550
2015-08-21 11:42:26 -06:00
Justin Findlay
a030caec75
Merge pull request #26554 from tjstansell/fix_thin_scp
...
/bin/sh is more portable than /bin/bash
2015-08-21 11:41:35 -06:00
Colton Myers
70884e1cb3
Fix git https auth for password of None
2015-08-21 11:06:14 -06:00
Colton Myers
7202510ae2
Merge pull request #26556 from rallytime/one-toctree
...
Add Getting Started with OpenNebula docs to Cloud Provider Specifics
2015-08-21 11:00:02 -06:00
Justin Findlay
f0b30bbc1b
add docs to ipset check exec mod
2015-08-21 10:27:12 -06:00
rallytime
f8c927f8b7
Add Getting Started with OpenNebula docs to Cloud Provider Specifics
2015-08-21 10:17:51 -06:00
Todd Stansell
3b5f7852bf
/bin/sh is more portable than /bin/bash
2015-08-21 09:13:07 -07:00
Mike Place
f0e1f3c966
Merge pull request #26532 from jodv/fix_24354
...
use same master eval logic for Minion and SMinion
2015-08-21 09:59:05 -06:00
Ivan Babrou
c228088de6
Properly check for ipset ranges, fixes #26453
...
This add support for idempotent runs of `ipset.present` state
if ranges are used as entries. IP1-IP2 and IP/MASK variants
are supported.
2015-08-21 09:42:51 -06:00
Nicole Thomas
3d95aad2a5
Merge pull request #26283 from nmadhok/vmware-cloud-tests-develop
...
Additional unit tests for VMware cloud driver
2015-08-21 08:57:39 -06:00
Justin Findlay
fced99ec88
Merge pull request #26548 from vakulich/develop
...
Catch OSError during cache directories creation, fixes #19249
2015-08-21 08:23:23 -06:00
Justin Findlay
cb42d3c0e4
Merge pull request #26547 from nmadhok/patch-1
...
Correcting spelling of digital in doc/topics/releases/2015.5.4.rst
2015-08-21 08:18:32 -06:00
Justin Findlay
27800ceb58
Merge pull request #26545 from nmadhok/vmware-key-error-patch-develop
...
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
2015-08-21 08:17:44 -06:00
Justin Findlay
de3347070e
Merge pull request #26544 from nmadhok/vmware-key-error-patch-2015.8
...
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
2015-08-21 08:16:53 -06:00
Justin Findlay
5064f11c1c
Merge pull request #26542 from arthurlogilab/patch-12
...
[doc] reactor documentation fix : returners
2015-08-21 08:14:34 -06:00
Justin Findlay
4703ac3028
Merge pull request #26535 from bobrik/ipset-ranges
...
Properly check for ipset ranges, fixes #26453
2015-08-21 08:13:01 -06:00
