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
69,121 Commits 24 Branches 182 Tags 341 MiB
71ebf2c8cd
Commit Graph

69121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pablo Suárez Hernández
71ebf2c8cd Fixing skipped boto tests to prevent errors if boto3 does not exists. 2016-09-06 12:41:56 +01:00
Nicole Thomas
d248ab0120 Merge pull request #36004 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-01 15:11:05 -06:00
rallytime
318bffed1d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-01 14:27:07 -06:00
Erik Johnson
678f10cf8b Avoid traceback in mac_user.py when user.chhome is invoked from a user state (#35901) 
* mac_user.py: Avoid traceback in chhome func

* Add warning about lack of Windows/Mac support for createhome
 2016-09-01 11:44:47 -06:00
Mike Place
f7b85cb70b Merge pull request #35952 from twangboy/fix_win_runas_2016.3 
Load UserProfile when using RunAs (2016.3)
 2016-09-02 00:18:15 +09:00
Mike Place
2da501071e Merge pull request #35967 from twangboy/improve_show_sls_2015.8 
Allow full path to be passed to show_sls (2015.8)
 2016-09-01 23:54:55 +09:00
Mike Place
d86fba15b3 Merge pull request #35981 from cachedout/cptestcase_license 
Update Salt's licensing information to include cptestcase
 2016-09-01 23:48:45 +09:00
Mike Place
dd562dd200 Update Salt's licensing information to include cptestcase 
From https://github.com/adamhajari/spyre/blob/master/LICENSE.txt
 2016-09-01 18:46:13 +09:00
Nicole Thomas
b8ca3f5e4d Merge pull request #35959 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-31 16:14:54 -06:00
twangboy
2ed9a82ef8 Allow full path to be passed to show_sls 2016-08-31 15:31:39 -06:00
rallytime
bb4605ffee Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-31 15:13:45 -06:00
Jacob Hammons
0f0f15d048 Merge pull request #35956 from jacobhammons/dot12 
Version docs to 2015.8.12
 2016-08-31 14:39:35 -06:00
Jacob Hammons
3e21e35933 Version docs to 2015.8.12 2016-08-31 14:38:16 -06:00
Jacob Hammons
a87b91a8ea Merge pull request #35955 from jacobhammons/dot3 
Version docs to 2016.3.3
 2016-08-31 14:35:55 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
twangboy
3721a09ea3 Load UserProfile on RunAs 2016-08-31 13:57:27 -06:00
Daniel Wallace
d2db4ea7a2 cachedir should be /cloud not /master (#35897) 
Fixes #35893
 2016-08-31 10:38:43 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
Andres Montalban
24f9d3397c Speed up FreeBSD pkg install process for pkg.latest since pkg command by default tries to update repository DB on each search: (#35904) 
https://www.freebsd.org/cgi/man.cgi?query=pkg-search&sektion=8&apropos=0&manpath=FreeBSD+10.3-RELEASE+and+Ports
 2016-08-31 09:46:13 -06:00
Denys Havrysh
b87e4f1e85 Salt Cloud: add centos default user for official CentOS AMIs (#35931) 2016-08-31 09:41:55 -06:00
Nicolas Delaby
580e0d4aa7 Mention that docker image names must be given with repository (#35926) 2016-08-31 09:26:13 -06:00
Mike Place
ca06c62900 Merge pull request #35868 from rallytime/fix-35825 
Add more helpful return messages for drac runner
 2016-08-31 10:33:27 +09:00
Erik Johnson
f4cdcc0d66 Better logging when file_recv_max_size is exceeded (#35914) 
This gives more information on what to do when this limit is exceeded.
 2016-08-30 14:03:02 -06:00
Nicole Thomas
95b89dbce9 Merge pull request #35903 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 into 2016.3
 2016-08-30 11:15:36 -06:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
rallytime
00ae17248e Update error message to be more helpful and fix doc formatting 2016-08-30 10:09:59 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Mike Place
6dd5f68a08 Merge pull request #35856 from vutny/2015.8 
[BACKPORT 2015.8] salt-cloud: fix path to Salt Master socket dir
 2016-08-30 16:10:02 +09:00
Mike Place
cf8f081401 Merge pull request #35855 from vutny/salt-cloud-fix-sock_dir 
[REGRESSION] salt-cloud: fix path to Salt Master socket dir
 2016-08-30 16:09:04 +09:00
Mike Place
336d1a700d Merge pull request #35880 from terminalmage/issue35747 
pacman.py: Fix incorrect return in pkg.latest_version
 2016-08-30 15:43:39 +09:00
Mike Place
f0987cf27a Merge pull request #35881 from whiteinge/salt-api-catch-serializer-error 
Add fail-safe in case Salt gives us data we can't serialize
 2016-08-30 15:43:11 +09:00
Mike Place
6383451c99 Merge pull request #35884 from terminalmage/clarify-pkg-latest-logic 
Add clarifying comments to the pkg.latest state, fix USE flag condition
 2016-08-30 15:42:35 +09:00
Erik Johnson
b0b419d1d8 Fix condition for Gentoo USE flag update 
In this scenario, ``avail[pkg]`` contains an empty string, we want to
reinstall the current version with new USE flags so the
currently-installed version is what we need to add to the targets.
 2016-08-29 19:18:50 -05:00
Erik Johnson
1542fd4716 Add clarifying comments to the pkg.latest state 
These comments explain what is being done as we evaluate which packages
need to be added to the install targets and which do not.
 2016-08-29 19:14:06 -05:00
Erik Johnson
123a611066 pacman.py: Fix incorrect return in pkg.latest_version 
This was initially broken in 75fd92f. The documented behavior of this
function is to return an empty string for the package when the package
is up-to-date. Changing that behavior negatively affects the pkg.latest
state, which relies on the documented behavior.
 2016-08-29 18:59:12 -05:00
Seth House
6e27fad21f Add fail-safe in case Salt gives us data we can't serialize 
Possibly seen in the wild with return data from a Runner that contains a
strange encoding that the JSON serializer can't handle.
 2016-08-29 17:57:31 -06:00
rallytime
30a422bfe0 Add more helpful return messages for drac runner 
We should also be more helpful and protect against a KeyError and
stacktrace when the "drac" username and password are not in the master
config file or passed in at the CLI.
 2016-08-29 13:15:07 -06:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864) 
Fixes #35837
 2016-08-29 12:22:30 -06:00
Nicole Thomas
40bcb7daed Fix IAM roles statement to be boto version specific in sqs_events (#35861) 
Fixes #35835
 2016-08-29 12:22:16 -06:00
Nicole Thomas
ee45a88bc8 Fix doc formatting for sqs_events engine example config (#35860) 
Fixes #35834
 2016-08-29 12:21:28 -06:00
Nicole Thomas
96747bc3bb Merge pull request #35859 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-29 12:21:04 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Denys Havrysh
eceedadfa5 salt-cloud: fix path to Salt Master socket dir 2016-08-29 18:10:30 +03:00
Denys Havrysh
a662ea5337 salt-cloud: fix path to Salt Master socket dir 2016-08-29 17:45:11 +03:00
Mike Place
dc705ff675 Merge pull request #35849 from theredcat/fix_file_makedirs_infinite_loop 
Fix potential infinite loop with no error when using recursive makedirs
 2016-08-29 20:37:19 +09:00
Nathan Delhaye
86d5398b28 Fix potential infinite loop with no error when using recursive makedirs 2016-08-29 10:30:58 +02:00
Mike Place
433743f609 Merge pull request #35682 from vutny/backport-35659 
[BACKPORT] Fix empty `fun_agrs` field in Reactor generated events
 2016-08-29 13:11:06 +09:00
Mike Place
eda2ae0add Merge pull request #35781 from thatch45/ssh_deploy_more 
follow up on the re-deploy if there is a checksum missmatch
 2016-08-29 11:15:25 +09:00
Mike Place
30c2db7b09 Merge pull request #35792 from DSRCorporation/bugs/34973_syndic_reconnect_master_2016.3 
Reconnect syndic to event bus if master disappeared.
 2016-08-29 11:13:19 +09:00
Mike Place
165237412c Merge pull request #35815 from gtmanfred/2015.8 
list_nodes_min should return a minimum dictionary
 2016-08-29 11:03:27 +09:00