valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
57,050 Commits 24 Branches 182 Tags 341 MiB
7d41d938f8
Commit Graph

57050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
2f9b40ca25 Merge pull request #26577 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-23 08:14:04 +01:00
Pedro Algarvio
789d5a71b7 Merge pull request #26534 from cachedout/bumpb_tornado_required_version 
Bump required Tornado version to 4.2.1
 2015-08-23 00:09:48 +01:00
Pedro Algarvio
be71ab9652 Merge pull request #26566 from cachedout/warn_on_masterless_publish 
Don't stacktrace trying to publish without a master
 2015-08-23 00:09:04 +01:00
Pedro Algarvio
965a4ba7cf Merge pull request #26581 from terminalmage/fix-tests 
Skip tests that don't work with older mock
 2015-08-23 00:06:27 +01:00
Pedro Algarvio
016e350c0f Merge pull request #26541 from terminalmage/masterless-winrepo 
Make winrepo execution module use the same code as the runner
 2015-08-22 22:47:31 +01:00
Pedro Algarvio
19992c1450 Merge pull request #26591 from rallytime/bp-26554 
Back-port #26554 to 2015.5
 2015-08-22 22:19:02 +01:00
Todd Stansell
6f8bed88cb /bin/sh is more portable than /bin/bash 2015-08-22 10:43:24 -06:00
Erik Johnson
49d8bd1dbe Remove unused import 2015-08-21 22:54:54 -05:00
Erik Johnson
81a0d4c915 Skip tests that don't work with older mock 
This fixes test failures on RHEL6 builds.

This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
 2015-08-21 21:35:11 -05:00
rallytime
e3f7db17cc Avoid race condition when assigning floating IPs to new VMs 
Fixes #12225
 2015-08-21 17:50:38 -06:00
rallytime
afda31be74 Create _assign_floating_ips function for DRY 2015-08-21 17:37:56 -06:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
 2015-08-21 16:44:59 -06:00
rallytime
ac67a1d238 Ensure GCE configuration check is correct 2015-08-21 16:40:03 -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
rallytime
421f1fde1e Ensure EC2 configuration check is correct 2015-08-21 16:38:14 -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
Michael Steed
186a4d052c wip: update spm for integration into raas 2015-08-21 16:20:42 -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
Nicole Thomas
2cd36c7ed4 Merge pull request #26565 from cachedout/fix_virtual_warnings 
Fix many errors with __virtual__ in tests
 2015-08-21 15:37:53 -06:00
Jenkins
3710b0bc7d Fix haproxy docs to be valid 2015-08-21 15:15:19 -06:00
Jenkins
26fc54b15b Don't stacktrace trying to publish without a master 2015-08-21 14:34:24 -06:00
Colton Myers
e362d003f5 Fix the git test (again) 2015-08-21 14:21:42 -06:00
Jenkins
41541e4e2b Fix many errors with __virtual__ in tests 
Also stop using __salt__ in __virtual__ which is not guaranteed to exist
 2015-08-21 14:01:03 -06:00
Erik Johnson
894a3c664f More lint fixes 2015-08-21 14:25:56 -05: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
Erik Johnson
fb8ca3aa7f Revert "Remove genrepo function" 
This reverts commit c403f1e9c2.
 2015-08-21 13:48:58 -05:00
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
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
Justin Findlay
f0b30bbc1b add docs to ipset check exec mod 2015-08-21 10:27:12 -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
Étienne BERSAC
0727af9e3d Defaults to current saltenv in state.sls 2015-08-21 16:46:32 +02: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
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