valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,469 Commits 24 Branches 182 Tags 341 MiB
da574e5b03
Commit Graph

69469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Tripp
98449e66f5 Better docs for use-instance-role-credentials. 2016-09-20 10:03:23 -07:00
rallytime
2740fb7bfd Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
 2016-09-20 10:39:53 -06:00
twangboy
fc4a03a75d Check for existing library on Windows 2016-09-20 09:31:13 -06:00
Mike Place
d0a495f08b Merge pull request #36310 from thatch45/keep_loop 
Fix bug where the client will destroy the loop
 2016-09-20 22:14:23 +09:00
Mike Place
6e16ca46ed Merge pull request #36394 from oba11/module-fixes 
fix accound_id in boto_iam and get_region in boto_sns
 2016-09-20 22:11:28 +09:00
Mike Place
266dd7c00a Merge pull request #36379 from twangboy/windows_grains 
Fix windows osrelease grain
 2016-09-20 22:09:39 +09:00
Mike Place
ae1fc430c2 Merge pull request #36424 from jfindlay/bp-36194 
skip some mac_timezone tests
 2016-09-20 15:43:47 +09:00
Mike Place
6319e3419a Merge pull request #36428 from terminalmage/issue36388 
A couple fixes for Antergos Linux
 2016-09-20 15:42:16 +09:00
Mike Place
155bd14b5e Merge pull request #36425 from whiteinge/salt-api-dict-payload 
Check for dictionary explicitly since we're accessing it as one
 2016-09-20 15:41:40 +09:00
Mike Place
420be364ee Merge pull request #36199 from thatch45/fix_18341 
skip all failhards if test=True
 2016-09-20 14:38:32 +09:00
Erik Johnson
b0069ad0d8 pacman.py: use os_family grain to assign as pkg virtual module 
This is a more future-proof method, it'll keep us from continuing to
update pacman.py each time we add another Arch derivative to the Arch
os_family.
 2016-09-19 22:20:51 -05:00
Erik Johnson
5d632dbfca Properly set os grain for Antergos 2016-09-19 22:17:00 -05:00
Erik Johnson
0ae8dca2d0 pkg.list_upgrades: Ignore "downloading" lines in pacman output 
It appears that Antergos distributes a modified version of pacman which
adds additional lines while updating its package databases. These are
incorrectly interpreted as available upgrades. This commit checks for
these lines in the output and skips them.
 2016-09-19 22:11:09 -05:00
Robert James Hernandez
85d2068326 Refactor for testing and adding related engine tests 2016-09-19 17:10:19 -07:00
Justin Findlay
a20a2148bf skip some mac_timezone tests 2016-09-19 16:48:22 -06:00
Seth House
0b63ed258f Check for dictionary explicitly since we're accessing it as one 
Fixes #36373.
 2016-09-19 16:43:52 -06:00
Robert James Hernandez
266adae2fd Make sqs_events engine support owner_acct_id 2016-09-19 14:59:47 -07:00
Nicole Thomas
b2365f553e Merge pull request #36418 from rallytime/bp-36246 
Back-port #36246 to 2016.3
 2016-09-19 15:56:52 -06:00
Nicole Thomas
bc703e2062 Merge pull request #36419 from rallytime/bp-36329 
Back-port #36329 to 2016.3
 2016-09-19 15:56:33 -06:00
Nicole Thomas
fbfa0657fc Merge pull request #36420 from rallytime/bp-36365 
Back-port #36365 to 2016.3
 2016-09-19 15:56:16 -06:00
twangboy
6138390da7 Fix typo 2016-09-19 15:08:34 -06:00
twangboy
cf045e5c03 Remove comment 2016-09-19 15:05:20 -06:00
twangboy
ddb6e11bcb Remove refactoring 2016-09-19 15:02:04 -06:00
twangboy
45dc920db0 Clarify comments 2016-09-19 14:56:48 -06:00
twangboy
211fd3b47e Improve version checking 2016-09-19 14:49:43 -06:00
=
864e513fca Fix a minor typo in docs 2016-09-19 14:32:10 -06:00
twangboy
88be5a3761 Check for Python 2.7.12 and 3.5.2 2016-09-19 14:31:05 -06:00
Oz N Tiram
ffdebf7a25 Fix a minor typo in docs 2016-09-19 14:30:34 -06:00
Erik Johnson
aab02f28b4 Ensure we have a test venv created using virtualenv < 13.0 
The test that runs these states is testing for behavior that was
obsoleted by virtualenv 13.0. Ensure that we have older virtualenv
available, and then create a venv with that older version. Use the
2nd virtualenv to attempt the "weird" install.
 2016-09-19 14:27:30 -06:00
Nicole Thomas
3dd2590e28 Merge pull request #36413 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-19 12:59:30 -06:00
twangboy
6f80f0062a Add osservicepack grain 2016-09-19 12:54:16 -06:00
Thomas S Hatch
5625827ee2 Merge pull request #36378 from terminalmage/issue36321 
git.latest Treat an up-to-date checkout with local changes as up-to-date
 2016-09-19 12:43:29 -06:00
Thomas S Hatch
a8a3a9f021 Merge pull request #36305 from gtmanfred/2016.3 
cache query args with url as well
 2016-09-19 12:30:51 -06:00
rallytime
c64e489f6f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-19 11:22:54 -06:00
Jacob Hammons
9bc4eeb71e Fix typo (#36409) 2016-09-19 11:15:03 -06:00
Erik Johnson
ac5c812e4b Fix OS identification for CloudLinux (#36408) 2016-09-19 11:14:43 -06:00
twangboy
04c4ec4f81 Fix lint 2016-09-19 09:56:22 -06:00
Erik Johnson
bb4d69f58a git.latest: fail gracefully for misconfigured remote repo (#36391) 
* git.latest: fail gracefully for misconfigured remote repo

When the remote repo's HEAD refers to a nonexistent ref, this was
causing a traceback when we tried to check if the upstream tracking
branch needed to be changed after cloning the repo. This commit fixes
this traceback by gracefully failing the state when the remote HEAD is
not present in the ``git ls-remote`` output, but the desired remote
revision doesn't exist.

Additionally, a similar graceful failure now happens if the state is run
again after we gracefully fail the first time, and we need to set the
tracking branch. Trying to set the tracking branch when there is no
local branch would fail with an ambiguous error like "fatal: branch
'master' does not exist", so before we even attempt to set the tracking
branch, the state is failed with a more descriptive comment.

* Add integration test for #36242
 2016-09-19 09:33:00 -06:00
Thomas S Hatch
a3c0d4a0ab Add docstring 2016-09-19 09:03:03 -06:00
Oluwaseun Obajobi
966685020c fix accound_id in boto_iam and get_region in boto_sns 2016-09-18 16:30:34 +04:00
Erik Johnson
71b51f49ba Add integration tests for PR #35433 2016-09-17 22:55:47 -05:00
Erik Johnson
82515eccde Add an additional hint for cases where rev == 'HEAD' 2016-09-17 22:55:47 -05:00
Erik Johnson
4b7e2f9475 git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures 
See https://github.com/saltstack/salt/issues/34790#issuecomment-238857462

This should help people understand the new behavior of the branch
parameter, when they run into non-fast-forward failures in git.latest
states when the remote rev differs from the name of the local branch.
 2016-09-17 22:55:47 -05:00
Erik Johnson
7b1f621206 Fix git.latest test with local changes to reflect changes in state 2016-09-17 21:56:31 -05:00
Erik Johnson
0364fedb76 Use a single conditional 2016-09-17 21:17:23 -05:00
Mike Place
602bd2d1ef Merge pull request #36389 from cachedout/pr-36386 
Pr 36386
 2016-09-17 20:54:37 +09:00
Mike Place
f5d63d93cc
Lint 2016-09-17 20:53:41 +09:00
Mike Place
ad7045ad3b Merge pull request #36315 from puneetk/patch-6 
No force_yes parameter to pkg.upgrade #21248
 2016-09-17 19:34:34 +09:00
Mike Place
2aa6df859a Merge pull request #36381 from twangboy/fix_win_service 
Add '/y' switch to the net stop and start commands
 2016-09-17 18:59:58 +09:00
Mike Place
373c5db180 Merge pull request #36384 from twangboy/update_setup_req 
Add windows requirements file
 2016-09-17 18:27:13 +09:00