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
73,163 Commits 24 Branches 182 Tags 341 MiB
c10be40fc2
Commit Graph

73163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
1027b1c83a Raise to 5s per @techhat 2016-08-29 11:04:34 +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
0e32adc272 Merge pull request #35842 from cachedout/pr-35818 
Pr 35818 [Lint / fixup]
 2016-08-29 11:02:02 +09:00
Mike Place
7e1119ff8f Fix lint and missing value 2016-08-29 11:00:58 +09:00
Mike Place
f7529b47b9 Lint 2016-08-29 10:48:28 +09:00
Mike Place
e092aa2274 Merge pull request #35830 from terminalmage/fix-logging-traceback 
Fix traceback in salt-cloud logging for Azure
 2016-08-29 10:24:24 +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
Mike Place
dc095187c7 Merge pull request #35839 from cachedout/pr-35836 
Ensure ssh keys are decodable before inserting [Lint]
 2016-08-29 10:19:11 +09:00
Mike Place
f6b31be592 Lint 2016-08-29 10:18:52 +09:00
Tarjei Husøy
8d2d20903d Ensure ssh keys are decodable before inserting 
Closes #35631.
 2016-08-28 11:45:41 -07: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
Andreas Lutro
3b014b363b deep merge with file.serialize merge_if_exists=True 2016-08-27 12:00:07 +02:00
Erik Johnson
93588b895c Fix traceback in salt-cloud logging for Azure 
This regressed in develop only, because of 20ed2c6
 2016-08-26 20:58:36 -05:00
Chandler Newby
f96194ae5c Fix regex bug 2016-08-26 18:19:54 -06:00
Nicole Thomas
9c0156e846 Merge pull request #35821 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-26 16:13:04 -06:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06: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
Chandler Newby
7fa8a182b3 Update inotify.py beacon 2016-08-26 13:42:36 -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
David Boucha
822b0a0f33 Don't test for linux shells on Windows (#35743) 
* Don't test for linux shells on Windows

* Don't force windows to be false

Salt didn't used to support runas on Windows.
Salt now supports runas on Windows. This line was causing the wrong code
paths to be followed.

* Skip test on windows because no VT on windows

* add missing closing paren
 2016-08-26 12:52:39 -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
e517da9e80 Bump the deprecation warning in pkgrepo state to Nitrogen (#35806) 
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 10:43:00 -06:00
Nicole Thomas
457e857981 Bump the deprecation warnings in glance module to Nitrogen (#35805) 2016-08-26 10:42:36 -06:00
Nicole Thomas
50f4d51628 Bump the deprecation warning in salt.client.mixins.py to Nitrogen (#35804) 2016-08-26 10:42:22 -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
Mike Place
f44d347a7c Lower the retry timer for waiting for a server to come in 
Since all we're doing is waiting on a socket, it's a little crazy
to wait 30s between tries. This makes salt-cloud really slow.
 2016-08-27 00:43:35 +09:00
Nicole Thomas
f973cf4fa3 Merge pull request #35785 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-26 09:31:12 -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
Travis Mehlinger
c595350c7e added event runner 2016-08-25 21:01:22 -05:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06: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
Kris Raney
9b3e48bd6e Fix pylint warnings in test code 2016-08-25 15:51:02 -05:00
Nicole Thomas
b8692db9f3 Bump template context deprecation to Nitrogen (#35776) 2016-08-25 14:35:44 -06:00
Thomas S Hatch
2558dcc100 follow up on the re-deploy if there is a checksum missmatch 2016-08-25 14:17:39 -06:00
Kris Raney
135c6c9ac0 Fix pylint warnings 2016-08-25 14:44:12 -05:00