valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,066 Commits 24 Branches 182 Tags 341 MiB
30c2db7b09
Commit Graph

69066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
Nicole Thomas
e355c1cf90 Merge pull request #35767 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-25 10:09:37 -06:00
rallytime
8ad6a12c80 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
 2016-08-25 10:08:52 -06:00
Thomas S Hatch
b3f6367621 Merge pull request #35753 from rallytime/fix-client-unit-test 
Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720
 2016-08-25 09:55:23 -06:00
Bo Maryniuk
a56ae4e8f5 Configure importing Mock to handle 'total' method from psutils properly 2016-08-25 16:48:34 +02:00
Bo Maryniuk
9c057d0266 Return psutil back to the list of mocked imports 2016-08-25 16:47:59 +02:00
Bo Maryniuk
3d7758461e Improve Mock to be flexible and able to mock methods from the mocked modules 2016-08-25 16:47:08 +02:00
rallytime
92f8c836e8 Add cmd_mock back in to function spec 2016-08-25 07:05:52 -06:00
rallytime
a671f0a092 Fixup the unit.client_test.LocalClientTestCase.test_cmd_subset from #35720 
Refs #35720
 2016-08-24 17:48:45 -06:00
Nicole Thomas
dab8428c01 Add versionadded for enabled function in apache_module state (#35732) 
Refs #35458
 2016-08-24 13:49:11 -06:00
Nicole Thomas
bab0e3d449 Merge pull request #35737 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-24 13:48:45 -06:00
Jacob Hammons
2a12795bac Fixes Windows download paths (#35742) 2016-08-24 13:38:17 -06:00
rallytime
61e37d5956 Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/loader.py
  - salt/modules/s3.py
  - salt/utils/s3.py
  - tests/unit/modules/s3_test.py
 2016-08-24 09:58:56 -06:00
Mike Place
7877ff1d5e Merge pull request #35729 from cachedout/fix_docs_build 
Remove docs mocks for msgpack and psutils
 2016-08-24 23:42:05 +09:00
Mike Place
fdbf01d5ad Remove docs mocks for msgpack and psutils 
Also make docs build py3 compat
 2016-08-24 22:55:11 +09:00
Mike Place
962e493304 Merge pull request #35628 from jf/fix_user.present_reporting_when_remove_groups=false 
Fix user.present state reporting for groups when remove_groups=false
 2016-08-24 17:15:30 +09:00
Mike Place
02d86c6550 Merge pull request #35696 from xiaoanyunfei/2016.3 
fix maximum recursion depth bug
 2016-08-24 17:01:16 +09:00
Mike Place
06a75be8bd Merge pull request #35701 from gtmanfred/2015.8 
use aws.get_location in s3 modules
 2016-08-24 16:46:30 +09:00
Mike Place
79d10aea2d Merge pull request #35720 from hu-dabao/fix-20575 
fix 20575, make subset really return random subset
 2016-08-24 16:03:58 +09:00
Hengyang Hu
70af980c01 fix 20575, make subset really return random subset 2016-08-23 21:35:01 -07:00
C. R. Oldham
79bc01b88c Make test runs behave better (#35708) 2016-08-23 14:15:48 -06:00
Nicole Thomas
5d0b9a248e Merge pull request #35700 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-23 11:23:40 -06:00
Daniel Wallace
2d2bc1ffea use aws.get_location in s3 modules 
Also load the __utils__ into pillar and fileserver and fileclient so
that this function can be used there with __opts__.

Also sets the default for s3 to 'us-east-1' like it is documented.

Closes #30976
Closes #28913
 2016-08-23 12:12:15 -05:00
rallytime
9e9923c3f4 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-23 10:14:04 -06:00
xiaofei.sun
5db9255926 fix maximum recursion depth 2016-08-23 22:17:02 +08:00
Mike Place
f305389172 Merge pull request #35634 from hu-dabao/fix-34922 
fix 34922, StopIteration should not throw exception out
 2016-08-23 17:13:08 +09:00
Mike Place
e45aa55d79 Merge pull request #35679 from twangboy/change.vcredist.version.2016.3 
Revert to vcredist 12 (2013)
 2016-08-23 17:05:40 +09:00
Mike Place
aee5b62542 Merge pull request #35680 from terminalmage/issue35630 
Don't use six.text_type() in salt.utils.gitfs
 2016-08-23 16:17:00 +09:00
Erik Johnson
d76659a63a Don't use six.text_type() in salt.utils.gitfs 
For Python 2, Pygit2 (as well as others) store unicode strings as bytes
(e.g. ``'\xd0\x94'``), not as unicode strings. This can result in a
``UnicodeDecodeError`` being raised when ``os.path.join()`` is invoked
and Python attempts to decode the bytestring.

This commit fixes the issue by using ``str()`` to force config values to
be strings, rather than ``six.text_type()``.

Resolves #35630.
 2016-08-22 20:21:32 -05:00
twangboy
3d6d473d48 Revert to vcredist 12 (2013) 2016-08-22 17:57:14 -06:00
Nicole Thomas
74678923b8 Fixup doc formatting for the sqs_events engine (#35663) 
Fixes #35509
 2016-08-22 13:04:33 -06:00
Nicole Thomas
9fe0972761 Merge pull request #35662 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-22 13:03:43 -06:00