Commit Graph

57066 Commits

Author SHA1 Message Date
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
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
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
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
Erik Johnson
c403f1e9c2 Remove genrepo function
It is totally out of place here, and redundant with the presence of
salt/modules/win_repo.py.
2015-08-21 02:38:12 -05:00
Erik Johnson
5aff1aeb9e Don't use os.rename() to overwrite file, causes errors on Windows 2015-08-21 02:38:12 -05:00
Erik Johnson
2819b85373 More meaningful error when repo cache not found 2015-08-21 02:38:12 -05:00
Erik Johnson
6f641893ee Fix minion-side winrepo_dir location to match master-side 2015-08-21 02:38:12 -05:00
Erik Johnson
8c254a40d8 Use imported winrepo runner functions to update winrepo 2015-08-21 02:38:12 -05:00
Erik Johnson
9f710ee787 Modify winrepo runner funcs to be able to be used in winrepo exec module 2015-08-21 02:38:11 -05:00
Justin Findlay
7da87fabf1 Merge pull request #26537 from jfindlay/note
Merge #26481
2015-08-20 23:37:24 -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
Erik Johnson
cca92412d8 Use salt.utils.fopen() instead of open() 2015-08-20 18:51:44 -05:00
Justin Findlay
343e47f00c check exists and values in boto_elb listeners
Fixes #26502.
2015-08-20 17:40:23 -06: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
662e723ae0 fixup note lint in file.replace state mod 2015-08-20 17:06:45 -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
Mike Place
c6d8e34730 Merge pull request #26528 from zmalone/2015.5
Fixing encrypt to instructions in the 2015.5 branch
2015-08-20 15:49:06 -06:00
Joseph Hall
aead0ac432 Fix references 2015-08-20 15:47:34 -06:00
Mike Place
854491c9f3 Merge pull request #26533 from cachedout/fix_event_socket
Fix too aggressive even init check
2015-08-20 15:29:07 -06:00
Jenkins
b44ab40e26 Fix too aggressive even init check 2015-08-20 15:28:44 -06:00
Shane Lee
20fddf40a1 Merge pull request #26522 from cro/proxy_should_not_load
Do not load package provider if its not a proxy
2015-08-20 14:43:21 -06:00
Mike Place
6048b1351d Merge pull request #26531 from cachedout/event_test_fix
Fix failing event tests and modify event init
2015-08-20 14:38:36 -06:00
Colton Myers
d2fd7e24ad Merge pull request #20 from terminalmage/pr-26530
Better sensitive data redaction in git execution module
2015-08-20 14:28:36 -06:00
Erik Johnson
509f89f64f Better sensitive data redaction in git execution module
This modifies the existing behavior such that re.IGNORECASE will be used
if we're on Python 2.7 or later. If not, then we try to match the regex
first on a lowercased version of the string, and if it matches, return
the substitution on a lowercased version of the string. If there is no
match, we just return the original string. This keeps us from
unnecessarily lowercasing the string.
2015-08-20 15:26:45 -05:00