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
62,619 Commits 24 Branches 182 Tags 341 MiB
e3f8618982
Commit Graph

62619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e3f8618982 Merge pull request #36662 from cachedout/skip_pip_tests_on_download_fail 
Skip over tests where upstream pip isn't there
 2016-09-29 15:12:26 +09:00
Mike Place
0bbc60ccd7
Skip over tests where upstream pip isn't there 2016-09-29 15:11:38 +09:00
Mike Place
3249a11e71 Merge pull request #36661 from cachedout/fix_grain_test_race 
Fix race between minion job timeout and cli test timeout
 2016-09-29 13:42:23 +09:00
Mike Place
b0190f248e Merge pull request #36660 from cachedout/fix_2068_issue_test 
Fix test not to rely on external resources
 2016-09-29 13:42:01 +09:00
Mike Place
2dcb92134d
Fix race between minion job timeout and cli test timeout 2016-09-29 13:23:26 +09:00
Mike Place
f4906fe771
Fix test not to rely on external resources 
We can still model the original issue without needing to call all the way out to pypi to do it.
 2016-09-29 12:35:02 +09:00
Mike Place
f0d561a229 Merge pull request #36632 from isbm/isbm-thin-modules-config-15.8 
Configure thin/min modules permanently
 2016-09-28 22:21:11 +09:00
Mike Place
9b9e167b47 Merge pull request #36562 from kiorky/s2015.8 
Fix pkg.latest_version using localized output
 2016-09-28 11:43:38 +09:00
Mike Place
4ab52ae0f6 Merge pull request #36607 from vutny/detect-service-fail 
`salt.states.service`: detect that service failed to start/stop
 2016-09-28 11:39:51 +09:00
Mike Place
5de036b56c Merge pull request #36611 from multani/2015.8 
jinja: fix YAML terminator removal in Jinja's "yaml" filter
 2016-09-28 11:36:21 +09:00
Jonathan Ballet
79fdc12395 jinja: fix YAML terminator removal in Jinja's "yaml" filter 2016-09-27 18:52:49 +02:00
elainearbaugh
6e36191fc4 Fix trust key 2015.8 (#36540) 
* Fix gpg.trust_key user bug

* Separated user and no user case
 2016-09-27 10:28:28 -06:00
Denys Havrysh
c4f899b3b3 salt.states.service: detect that service failed to start/stop 2016-09-27 18:24:37 +03:00
Bo Maryniuk
975f8bb27d Add extra-mods options to the Salt-Thin via SSH CLI 2016-09-27 11:12:18 +02:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
Bo Maryniuk
3bfb17ee62 Add a description of the thin/min parameters to the master config 2016-09-27 11:06:43 +02:00
Bo Maryniuk
3d878f9da5 Get the thin Salt with configured extra modules on SSH 2016-09-27 11:05:28 +02:00
Bo Maryniuk
2be9330be6 Add thin options to the master config. 2016-09-27 11:03:38 +02:00
Bo Maryniuk
58577d342e Generate thin with configured extrta modules 2016-09-27 10:59:07 +02:00
Erik Johnson
57ec792f6b Merge pull request #36550 from rickyninja/2015.8 
Add version_cmp for FreeBSD pkg.
 2016-09-26 20:45:57 -05:00
Jeremy Singletary
f9ef30aabe Add version_cmp for FreeBSD pkg. 2016-09-26 00:58:49 -07:00
Mathieu Le Marec - Pasquet
47c3d03035 Fix pkg.latest_version using localized output 
This fixes #36561.
 2016-09-25 10:01:33 +00:00
Nicole Thomas
07c9d040c0 Fixup the rabbitmq_user state test failure (#36541) 2016-09-23 15:05:40 -06:00
Mike Place
1c3758544c Merge pull request #36441 from twangboy/update_setup 
Check for existing libraries on Windows
 2016-09-23 18:20:58 +09:00
Denys Havrysh
bf6195b9a6 postgres_extension state: small corrections in docstrings (#36500) 2016-09-22 08:13:24 -06:00
Mike Place
b021ea5d40 Merge pull request #36464 from vutny/postgres-tablespace-options 
Fix `options` parameter processing in `postgres_tablespace.present`
 2016-09-22 13:24:04 +09:00
Denys Havrysh
580aed87b9 Fix options parameter processing in postgres_tablespace.present 2016-09-21 14:36:53 +03:00
Mike Place
41d3c09857 Merge pull request #35433 from terminalmage/issue34790 
git.latest: Add a hint for possible rev changes resulting in non-fast-forward failures
 2016-09-21 16:02:18 +09:00
Mike Place
87263b9387 Merge pull request #36445 from notpeter/salt_cloud_iam_role 
Better docs for use-instance-role-credentials.
 2016-09-21 14:58:53 +09:00
Peter Tripp
469d1a61fe Remove (required). 2016-09-20 10:08:09 -07:00
Peter Tripp
98449e66f5 Better docs for use-instance-role-credentials. 2016-09-20 10:03:23 -07:00
twangboy
fc4a03a75d Check for existing library on Windows 2016-09-20 09:31:13 -06:00
Mike Place
266dd7c00a Merge pull request #36379 from twangboy/windows_grains 
Fix windows osrelease grain
 2016-09-20 22:09:39 +09: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
twangboy
88be5a3761 Check for Python 2.7.12 and 3.5.2 2016-09-19 14:31:05 -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
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
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