Erik Johnson
73537300cb
Lint fixes
2015-08-21 13:48:55 -05:00
Erik Johnson
e7099af0f6
Get rid of useless unit tests and add integration test for winrepo
2015-08-21 13:14:42 -05: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
Justin Findlay
5a32664efd
Merge pull request #26553 from rallytime/bp-26548
...
Back-port #26548 to 2015.5
2015-08-21 11:40:21 -06:00
Justin Findlay
7e67e48656
Merge pull request #26552 from rallytime/bp-26542
...
Back-port #26542 to 2015.5
2015-08-21 11:40:11 -06:00
Justin Findlay
bcd462545d
Merge pull request #26551 from rallytime/bp-26539
...
Back-port #26539 to 2015.5
2015-08-21 11:39:22 -06:00
Justin Findlay
4dbf61c5af
Merge pull request #26549 from rallytime/bp-26524
...
Back-port #26524 to 2015.5
2015-08-21 11:38:50 -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
Vasili Akulich
ec2b2c3e40
Catch OSError during cache directories creation, fixes #19249
2015-08-21 09:47:15 -06:00
Arthur Lutz
0976b1e23b
[doc] reactor documentation fix : returners
2015-08-21 09:46:04 -06:00
Calle Pettersson
94ff4cff40
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 09:44:20 -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
Jens Rantil
4763f28725
logging(cmp_version): output assertion
...
Log error. The integer comparison is Python 3 compatible and ripped from
[1]. This will catch incorrectly implemented version comparison
functions.
[1] http://stackoverflow.com/a/3646519/260805
2015-08-21 09:41:30 -06:00
Jens Rantil
673b6c683d
utils(version_cmp): handle comparison not in (0,1,-1)
...
See [1]. It fixes it.
[1] https://github.com/saltstack/salt/issues/18652#issuecomment-133073612
2015-08-21 09:41:30 -06:00
Nicole Thomas
1ac8287588
Merge pull request #26527 from jfindlay/elb
...
check exists and values in boto_elb listeners
2015-08-21 09:27:52 -06:00
Jenkins
fc97f38854
Bump required Tornado version to 4.2.1
2015-08-21 09:21:13 -06:00
Erik Johnson
d2166e95cb
Fix formatting
2015-08-21 10:19:36 -05:00
Erik Johnson
38136b3757
Don't allow the winrepo git clone dirs contain dots
...
This messes up SLS paths.
2015-08-21 10:15:57 -05:00
Nicole Thomas
e4b2534aa8
Merge pull request #26446 from stanislavb/2015.5-ec2-metadata-region
...
Fetch AWS region from EC2 instance metadata
2015-08-21 09:11:08 -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
d721b7b2be
Merge pull request #26546 from nmadhok/vmware-key-error-patch-2015.5
...
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
2015-08-21 08:17:49 -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
1dcf157256
Do not raise KeyError when calling avail_images if VM/template is in disconnected state
2015-08-21 07:10:18 -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
Ageeleshwar Kandavelu
63efe11e4f
ini modules test fix
2015-08-21 16:29:30 +05:30
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
Ageeleshwar Kandavelu
dd48f8ff50
ini_unit test fix
2015-08-21 14:47:13 +05:30
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
Erik Johnson
9852bedda2
Tweak wording a bit
2015-08-21 03:04:41 -05:00
Erik Johnson
74d1256338
Update release notes
2015-08-21 02:39:34 -05:00
Erik Johnson
fff709da81
Add a bunch more documentation for winrepo
2015-08-21 02:39:34 -05:00
Erik Johnson
b04bc228d0
Correct some inaccurate documentation, fix formatting
2015-08-21 02:38:12 -05:00
Erik Johnson
fb46a6cbda
Rename ref anchor
2015-08-21 02:38:12 -05:00
Erik Johnson
bca44d8591
Config path not required anymore
...
It hasn't been necessary to specify the config path for a couple years.
2015-08-21 02:38:12 -05:00
