valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,100 Commits 24 Branches 182 Tags 341 MiB
580e0d4aa7
Commit Graph

69100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mike Place
b12c6577d2 Merge pull request #35833 from terminalmage/2015.8-top-file-merging-docs 
One more tweak to top file merging docs
 2016-08-29 10:21:16 +09:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
Nicole Thomas
43c08ae431 Merge pull request #35817 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-26 14:44:18 -06:00
Daniel Wallace
805d43598e list_nodes_min should return a minimum dictionary 
Not true or False
 2016-08-26 14:39:41 -05:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Nicole Thomas
d285fe64b7 Merge pull request #35811 from rallytime/bp-35576 
Back-port #35576 to 2015.8
 2016-08-26 12:54:08 -06:00
Hengyang Hu
b89f45598e fix 34241, webutil.useradd_all is deprecated (#35788) 
* fix 34241, webutil.useradd_all is deprecated

* in src webutil.useradd_all get replaced by webutil.useradd, change the mocks accordingly
 2016-08-26 12:52:11 -06:00
Art Schneider
04c063b315 Updated user.py to redact password when test=true 2016-08-26 11:07:20 -06:00
Nicole Thomas
2be5daf8c4 Bump the deprecation warning in pkgrepo state to Nitrogen (#35810) 
Let's give users a little more time to update their states given
the issues found in #33536 that were fixed recently by #35055.
 2016-08-26 11:05:15 -06:00
fix7
083d836666 Fix misuse of HTTP credentials in modjk execution module (#35796) 
fix #35741 . HTTP Credentials are now used in the right order.
 2016-08-26 11:00:53 -06:00
Todd Wells
e212c55b7a Schedule documentation update (#35745) 
* Scheduling jobs add state and module options

* Scheduling jobs doc formatting
 2016-08-26 10:47:04 -06:00
Erik Johnson
eb4d2f299b Better unicode handling in gitfs (#35802) 
* Revert "Don't use six.text_type() in salt.utils.gitfs"

This reverts commit d76659a63a.

* salt.utils.path_join: handle mixed unicode/binary-unicode paths

* Add test for mixed unicode and binary-unicode paths

* salt.utils.gitfs: replace os.path.join with salt.utils.path_join
 2016-08-26 10:44:22 -06:00
Jacob Hammons
0247867898 Adds mock for tornado.locks (#35807) 2016-08-26 10:43:34 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581 Trivial documentation spelling fix (#35800) 
Change `statnds` to `stands` in State Writing documentation.
 2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
Dmitry Kuzmenko
9afdbb0e97 Reconnect syndic to master event bus if master disappears. 2016-08-26 13:03:35 +03:00
Dmitry Kuzmenko
ab1afd002e Fixed syndic event bus connection. 
Connect syndic to master event bus in a coroutine. This fixes connection
timeout handling and prevents CPU utilization by connect loop if no
master is running.
 2016-08-26 13:03:29 +03:00
Dmitry Kuzmenko
ea8e1385c1 Fixed syndic unhandled future exception if master is stopped. 2016-08-26 11:53:10 +03:00
Nicole Thomas
9b5ee2155e Merge pull request #35763 from isbm/isbm-doc-conf-sphinx-crashfix 
Sphinx crash: documentation config fix
 2016-08-25 15:12:38 -06:00