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 |
|
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 |
|
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 |
|
Vasili Akulich
|
fabe4e2300
|
Catch OSError during cache directories creation, fixes #19249
|
2015-08-21 16:01:13 +03:00 |
|
Nitin Madhok
|
ed343aee6e
|
Correcting spelling of digital
|
2015-08-21 07:24:17 -04:00 |
|
Nitin Madhok
|
5a0c01eaf0
|
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
|
2015-08-21 07:07:35 -04:00 |
|
Nitin Madhok
|
ca575e0eab
|
Do not raise KeyError when calling avail_images if VM/template is in disconnected state. Fixes #26372
|
2015-08-21 07:03:49 -04:00 |
|
Nitin Madhok
|
b2a1ec25e7
|
Lint fix
|
2015-08-21 06:46:41 -04:00 |
|
Nitin Madhok
|
df85bf351b
|
Skip the unit tests that need pyVmomi installed if it is not present
|
2015-08-21 06:20:18 -04:00 |
|
Arthur Lutz
|
337b466b11
|
[doc] reactor documentation fix : returners
|
2015-08-21 11:45:39 +02:00 |
|
Ivan Babrou
|
5b82c45746
|
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:18:54 +01:00 |
|
Justin Findlay
|
1757e980d8
|
Merge pull request #26539 from carlpett/patch-1
Doc-fix: Escape backslash in domain\username
|
2015-08-21 01:19:41 -06:00 |
|
Calle Pettersson
|
fd39928389
|
Doc-fix: Escape backslash in domain\username
The unescaped backslash in "mydomain\username" makes it appear like "mydomainusername", slightly confusing the documentation.
|
2015-08-21 08:22:28 +02:00 |
|
Justin Findlay
|
aea76abdd5
|
Merge pull request #26524 from JensRantil/issue-18652
Gracefully handle package comparison not in (-1, 0, 1)
|
2015-08-20 23:42:50 -06:00 |
|
Justin Findlay
|
e7ebfd05b9
|
Merge pull request #26512 from trananhkma/develop
fix raven
|
2015-08-20 23:35:30 -06:00 |
|
Justin Findlay
|
2fee5708bb
|
Merge pull request #26501 from terminalmage/git_pillar_docs
Update git_pillar docs, add git.list_worktrees function
|
2015-08-20 23:34:02 -06:00 |
|
Trần Tuấn Anh
|
c71a1ea491
|
remove raven.load()
|
2015-08-21 10:54:57 +07:00 |
|
Trần Tuấn Anh
|
af3ebd7e53
|
pep8
|
2015-08-21 09:23:34 +07:00 |
|
Trần Tuấn Anh
|
37d3d7eb99
|
options fix
|
2015-08-21 09:19:14 +07:00 |
|
Trần Tuấn Anh
|
ea3908debd
|
handled options
|
2015-08-21 09:12:23 +07:00 |
|
Erik Johnson
|
cca92412d8
|
Use salt.utils.fopen() instead of open()
|
2015-08-20 18:51:44 -05:00 |
|
Justin Findlay
|
80110387c7
|
Merge pull request #26521 from terminalmage/issue15519
Work around upstream git bug when cloning repo as root
|
2015-08-20 17:32:16 -06:00 |
|
Justin Findlay
|
73183cbdb4
|
Merge pull request #26518 from krak3n/fix/25492
Fix for #25492
|
2015-08-20 17:28:34 -06:00 |
|
Justin Findlay
|
e2c43916d2
|
Merge pull request #26514 from evverx/unmask-runtime-masked-services
Unmask a runtime masked services too
|
2015-08-20 17:27:07 -06:00 |
|
Justin Findlay
|
51065b834f
|
Merge pull request #26511 from rasathus/support-nested-upstart
Adds support for nested upstart scripts in the form of subfolder/serv…
|
2015-08-20 17:18:17 -06:00 |
|
Justin Findlay
|
dfd8c457bd
|
Merge pull request #26529 from mnalt/fix_freebsdservice_module_for_missing_rcconf
bugfix: fix service.enable for missing rc.conf
|
2015-08-20 16:53:08 -06:00 |
|
Colton Myers
|
ff2d6c6045
|
Fix git test
|
2015-08-20 16:23:36 -06:00 |
|
Colton Myers
|
a3fc46da0b
|
py3 compat
|
2015-08-20 16:23:32 -06:00 |
|
Mike Place
|
dd1bfa821b
|
Merge pull request #26516 from techhat/spmloader2
Move more path operations into SPM loader
|
2015-08-20 16:15:20 -06:00 |
|