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
59,965 Commits 24 Branches 182 Tags 341 MiB
4a6b53f329
Commit Graph

59965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
0f05d49bde Ensure that pki_dir exists 2015-12-29 15:07:26 -07:00
Ryan Lane
ae22edb1b4 Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly 2015-12-29 14:04:55 -08:00
Mike Place
896655602e Merge pull request #30064 from rallytime/fix-30045 
Add Syndic documentation to miscellaneous Salt Cloud config options
 2015-12-29 13:15:45 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options 
Fixes #30045
 2015-12-29 11:53:49 -07:00
Mike Place
bad6daca93 Merge pull request #30049 from rallytime/esxi-unit-tests 
Add some more unit tests for the vsphere execution module
 2015-12-29 10:07:41 -07:00
Mike Place
cedee772d7 Merge pull request #30060 from rallytime/bp-27104 
Back-port #27104 to 2015.8
 2015-12-29 10:06:58 -07:00
William Huba
f0566c4b8f Remove only the file extension on cached node files instead of replacing every '.p' substring. 2015-12-29 09:21:12 -07:00
Mike Place
84db12212d Merge pull request #30059 from mpreziuso/patch-1 
Fixes wrong function scope
 2015-12-29 09:12:06 -07:00
Michele Preziuso
1cb1c2da07 Fixes wrong function scope 
`sdecode` is not in `salt.utils` but rather in `salt.utils.locales`.
This causes Python to throw an exception when executing `win_update.list_updates verbose`:

```
                The minion function caused an exception: Traceback (most recent call last):
                  File "c:\salt\bin\lib\site-packages\salt\minion.py", line 1036, in _thread_return
                    return_data = func(*args, **kwargs)
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 512, in list_updates
                    return str(quidditch.GetSearchResultsPretty())
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 310, in GetSearchResultsPretty
                    updates = self.GetSearchResults()
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 305, in GetSearchResults
                    updates.append(salt.utils.sdecode(update))
                AttributeError: 'module' object has no attribute 'sdecode'
```
 2015-12-29 13:20:51 +00:00
Mike Place
87667e2de6 Merge pull request #30048 from jacobhammons/28540 
Remove internal APIs from rest_cherrypy docs.
 2015-12-28 16:24:13 -07:00
rallytime
1a83147986 Remove unnecessary import block 2015-12-28 16:14:13 -07:00
rallytime
695107ae6e Add some more unit tests for the vsphere execution module 
And fix a coupl of small bugs found in the module through testing
 2015-12-28 16:11:33 -07:00
Jacob Hammons
a04cebd48c Remove internal APIs from rest_cherrypy docs. 
Refs #28540
 2015-12-28 15:26:16 -07:00
Mike Place
3c63527313 Merge pull request #30043 from rallytime/fix-29960 
Be explicit about importing from salt.utils.jinja to avoid circular imports
 2015-12-28 14:35:18 -07:00
Mike Place
6cdca314c7 Merge pull request #30038 from rallytime/bp-30017 
Back-port #30017 to 2015.8
 2015-12-28 13:41:45 -07:00
Mike Place
c846e7bc86 Merge pull request #30036 from rallytime/bp-29995 
Back-port #29995 to 2015.8
 2015-12-28 13:41:04 -07:00
Mike Place
27b0bd2c34 Merge pull request #30035 from rallytime/bp-29895 
Back-port #29895 to 2015.8
 2015-12-28 13:20:58 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893 
Back-port #29893 to 2015.8
 2015-12-28 13:20:51 -07:00
Mike Place
4d4dfd692a Merge pull request #30033 from rallytime/bp-29876 
Back-port #29876 to 2015.8
 2015-12-28 13:20:42 -07:00
rallytime
a157c78bc8 Be explicit about importing from salt.utils.jinja to avoid circular imports 
Fixes #29960
 2015-12-28 13:02:20 -07:00
Mike Place
a5f7d9c2fc Merge pull request #30029 from terminalmage/git.latest-nonexistant-branch 
git.latest: Fix handling of nonexistant branches
 2015-12-28 12:39:29 -07:00
rallytime
aab35b883e Add versionadded directive for new check_exists function. 2015-12-28 12:32:42 -07:00
Andreas Lutro
ca290ec3e1 change how alternatives states check for installed 2015-12-28 12:31:19 -07:00
Ruxandra Burtica
129a6d7b9f Added vm_ to the get_location query. 2015-12-28 12:30:28 -07:00
Ruxandra Burtica
af8d01a367 Updated ec2 file to correctly propagate location. 2015-12-28 12:30:28 -07:00
Aditya Kulkarni
09f208fe63 Do not SSH to the instance if deploy is False 2015-12-28 12:29:32 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section. 
Added ssh_port section.
 2015-12-28 12:11:16 -07:00
abednarik
fc024e3cf4 Handle missing source file in ssh_auth. 
Added one more condition to check if source file exsists. In case source is set
but source is not a file data and err variables are set to return a proper response.

Fixes #29654
 2015-12-28 15:16:34 -03:00
Erik Johnson
0b95894c9f git.latest: Fix handling of nonexistant branches 
This commit fixes a traceback when a branch does not exist in the remote
repository.
 2015-12-28 11:16:43 -06:00
Mike Place
e7fe24dc64 Merge pull request #30016 from alprs/fix-gen_locale_normalize 
Properly normalize locales in locale.gen_locale
 2015-12-28 08:33:48 -07:00
Mike Place
90611e95f4 Merge pull request #30015 from alprs/fix-gen_locale_escaped_newline 
locale module: don't escape the slash in \n
 2015-12-28 08:31:20 -07:00
Mike Place
b871ce5310 Merge pull request #30022 from gqgunhed/winrepo_typo 
Two minor typos fixed
 2015-12-28 08:22:24 -07:00
Mike Place
1c6c9b1a06 Merge pull request #30025 from jtand/boto_tests 
Skipping some Boto tests until resolved moto issue
 2015-12-28 08:21:45 -07:00
Mike Place
4b8ac20d45 Merge pull request #30026 from alprs/fix-at_without_tag_job 
states.at: fix wrong variable being used
 2015-12-28 08:21:23 -07:00
Andreas Lutro
c0fe9c09bd states.at: fix wrong variable being used 2015-12-28 10:32:24 +01:00
justinta89
e706642152 Skipping some Boto tests until resolved moto issue 
Similar to #29725. Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
 2015-12-27 22:34:09 -07:00
Gunther Stengl
a052ff016e fixed minor typos and a :ref: link 
1.) closed the tag for hyperlink.
2.) added two full stops.
 2015-12-27 15:20:18 +01:00
Gunther Stengl
e47db1a076 Merge remote-tracking branch 'refs/remotes/saltstack/2015.8' into winrepo_typo 2015-12-27 15:17:54 +01:00
Gunther Stengl
0c4c8b9b5c Merge remote-tracking branch 'refs/remotes/saltstack/2015.8' into 2015.8 2015-12-27 15:08:32 +01:00
Andreas Lutro
75eb4511d3 properly normalize locales in locale.gen_locale 
this fixes a problem where locale.gen_locale "en_US.UTF-8" would
constantly try adding a new locale instead of just uncommenting and
generating the existing "en_US.UTF-8 UTF-8" locale, because the charset
at the end doesn't get appended.
 2015-12-26 22:32:29 +01:00
Andreas Lutro
5799729aee locale module: don't escape the slash in \n 
this would cause the literal string "en_US.UTF8\n" to be appended to the
locale file.
 2015-12-26 21:50:48 +01:00
Mike Place
a3410fdf41 Merge pull request #29966 from multani/fix/docs 
Fix bigip state/module documentation + serializers documentation
 2015-12-23 08:06:46 -07:00
Jonathan Ballet
e6e36372a4 doc: fix documentation link for salt.serializers 2015-12-23 10:13:16 +01:00
Jonathan Ballet
23ef472a07 bigip: fix documentation formatting, remove warnings during doc building 2015-12-23 10:13:16 +01:00
Mike Place
8f8c8cedd0 Merge pull request #29904 from twangboy/osx_build 
Improvements to osx packaging scripts
 2015-12-22 14:40:23 -07:00
Mike Place
0f91021c59 Merge pull request #29949 from aletourneau/2015.5 
Enhanced netscaler docstring
 2015-12-22 13:26:52 -07:00
twangboy
0be53953af Added function to download and check hashes, added hash files 2015-12-22 13:08:23 -07:00