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
61,952 Commits 24 Branches 182 Tags 341 MiB
9870479d99
Commit Graph

61952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
9870479d99 Add exclude option to state 2016-06-02 16:04:19 -06:00
twangboy
50bd76e206 Add exclude option 2016-06-02 15:49:56 -06:00
Mike Place
56c0a42e12 Create missing jid dir if it doesn't exist (#33653) 
Closes #33554
 2016-06-02 16:20:33 -04:00
Mike Place
8a566ff4b9 Merge pull request #33654 from twangboy/fix_win_servermanager 
Fix win servermanager
 2016-06-02 10:55:45 -07:00
Mike Place
996ff56dd4 Merge pull request #33679 from terminalmage/issue33424 
Only compile the template contents if they evaluate to True
 2016-06-02 10:20:00 -07:00
twangboy
6c7b21676a Fix lint and tests 2016-06-01 17:10:55 -06:00
twangboy
4775e6bdf0 Add additional params to state 2016-06-01 17:10:55 -06:00
twangboy
b0af32346d Add additional params to install and remove 2016-06-01 17:10:55 -06:00
Erik Johnson
9da40c4437 Append empty dictionaries for saltenvs with no top file 
Rather than excluding them from the get_tops() return data at all, just
populate them with empty dictionaries. This makes it easier to unit test
things like merge order, while still being functionally the same as
exlcluding the saltenv from get_tops() altogether.
 2016-06-01 17:31:29 -05:00
Mike Place
c8dc70b96a Merge pull request #33685 from jfindlay/get_url_test 
modules.cp.get_url: add test for https://
 2016-06-01 15:25:41 -07:00
Mike Place
5e022ff29c Merge pull request #33581 from dincamihai/2015.8 
Call zypper refresh after adding/modifying a repository
 2016-06-01 15:25:11 -07:00
Mike Place
069ee15b7c Merge pull request #33681 from rallytime/bp-33599 
Back-port #33599 to 2015.8
 2016-06-01 14:14:29 -07:00
Mike Place
13537c4891 Merge pull request #33396 from babilen/issue-33393 
Issue 33393
 2016-06-01 14:12:03 -07:00
Justin Findlay
2b5035fdc0 modules.cp.get_url: add test for https:// 2016-06-01 15:10:12 -06:00
Ethan Moore
45143a599b use requests streaming for uploads/downloads to file (return_bin unchanged) 
allows downloading files larger than amount of memory (non-stream reads into memory before writing to disk or uploading)
 2016-06-01 16:10:26 -04:00
Ethan Moore
4a9b23f03f first go at having requests use streaming for get/put requests 2016-06-01 16:07:49 -04:00
Erik Johnson
5eb1b3ca62 Only compile the template contents if they evaluate to True 
When getting all the top files for the various environments, those
environments without a top file will return ``False`` when we attempt to
cache the file. Passing a boolean to ``compile_template()`` will result
in an error being logged, since we are invoking the function incorrectly
(it expects the template data to be a string).

Since a ``False`` return from caching the file means that it does not
exist, this commit will only run ``compile_template()`` when the
contents evaluate to ``True``.

Resolves #33424.
 2016-06-01 13:24:31 -05:00
Mike Place
7bce4ece1a Merge pull request #33652 from terminalmage/zh723 
Lower the log level for failed auths
 2016-06-01 09:37:09 -07:00
Erik Johnson
411841603a Lower the log level for failed auths 
Since failed auths are most often due to key rotation, they should be
logged as debug messages rather than errors.
 2016-05-31 16:03:50 -05:00
Mike Place
504989388a Merge pull request #33615 from danslimmon/mysql-traceback-33582 
Fix crash on unconnectable MySQL server (resolves #33582)
 2016-05-31 09:03:51 -07:00
Mihai Dinca
788730ea72 DRY test 2016-05-30 13:52:46 +02:00
Mihai Dinca
1d3769ccfa Improve zypper_patcher_config looks 2016-05-30 13:52:45 +02:00
Mihai Dinca
42d8d4195c Assert only gpgautoimport: True works 2016-05-30 13:51:54 +02:00
Mihai Dinca
ced75e8e62 Reverse if conditions and rename variable 2016-05-30 10:48:27 +02:00
Mihai Dinca
80bfbe5c52 Reduce dicts and lists to one line where possible 2016-05-30 10:47:41 +02:00
Mihai Dinca
1d5d6d7d60 Update test method names to pass pylint 2016-05-30 10:05:07 +02:00
Dan Slimmon
180099ae9f Wrote test for broken server connection 2016-05-30 03:23:18 +00:00
Dan Slimmon
c6c3ff02e3 Added some error checking to resolve #33582. 2016-05-30 03:22:59 +00:00
Mike Place
b47182e47c Merge pull request #33558 from twangboy/fix_win_servermanager 
Fix win servermanager
 2016-05-27 15:05:43 -07:00
twangboy
62a6bde0ea Fix comment when already installed 2016-05-27 11:33:52 -06:00
twangboy
79bc7195dc Fix unit tests 2016-05-27 11:33:52 -06:00
twangboy
56a6f6bb83 Fix changes 2016-05-27 11:33:52 -06:00
twangboy
8ebe99ec5e Fix restart_needed 2016-05-27 11:33:52 -06:00
twangboy
6e478cbda0 Add restart needed 2016-05-27 11:33:52 -06:00
twangboy
72ebf26616 Add missing import 2016-05-27 11:33:52 -06:00
twangboy
193583be96 Use dictionary compare for changes in remove 2016-05-27 11:33:52 -06:00
twangboy
1ae7dd76c1 Use dictionary compare for changes 2016-05-27 11:33:52 -06:00
Mihai Dinca
c7ae5907ee Call zypper refresh after adding/modifying a repository 
Calling `zypper --gpg-auto-import-keys refresh` is required after
adding/modifying a repository because `--gpg-auto-import-keys` doesn't
do anything when called with `zypper ar` or `zypper mr`.
Without calling `zypper --gpg-auto-import-keys refresh` here, calling
`zypper ref` after adding/removing would still ask for
accepting/rejecting the gpg key.
 2016-05-27 16:17:10 +02:00
Mike Place
58d89d66e3 Merge pull request #33555 from cachedout/issue_33544 
Fix crashing Maintenence process
 2016-05-26 12:25:39 -07:00
Mike Place
fe7ee7a470 Fix crashing Maintenence process 
The first time through the loop we deleted the dir and then stack
traced the second time through the loop if we hit the other conditional.

Resolves #33544
 2016-05-26 11:14:56 -06:00
Mike Place
d052908729 Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8 
unit tests for rpm.checksum() and zypper.download()
 2016-05-26 07:34:27 -07:00
Mike Place
e2d0c4abb1 Merge pull request #33513 from rallytime/fix-33319 
Add a section to the jinja docs about escaping jinja
 2016-05-26 07:24:58 -07:00
Mike Place
fabc15e616 Merge pull request #33520 from jacobhammons/release-notes.8 
Updated version numbers in the docs for the 2016.3.0 release
 2016-05-26 07:15:00 -07:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Jacob Hammons
42e358af7d Updated version numbers in the docs for the 2016.3.0 release 2016-05-25 18:06:03 -06:00
rallytime
81c1471209 Add a section to the jinja docs about escaping jinja 
Fixes #33319
 2016-05-25 15:26:11 -06:00
Nicole Thomas
5a6b037cbd Merge pull request #33507 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-25 13:14:41 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
 2016-05-25 12:26:00 -06:00
Mike Place
ee76be3b0b Merge pull request #33503 from rallytime/fix-15252 
Add docs about minion config file in standalone minion docs
 2016-05-25 10:23:07 -07:00
Mike Place
6f7fda0354 Merge pull request #33486 from jtand/2015.5 
Add docstring examples to glance.py [2015.5]
 2016-05-25 10:21:22 -07:00