valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
68,062 Commits 24 Branches 182 Tags 341 MiB
13b660cdf7
Commit Graph

68062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c725854596 Merge pull request #33680 from rallytime/bp-32942 
Back-port #32942 to 2016.3
 2016-06-01 15:14:19 -07:00
Justin Anderson
9d437bd45d Removed artifact from testing 2016-06-01 15:32:41 -06:00
Justin Anderson
134e1fa888 Fixed typos, and added destructiveTest decorator 2016-06-01 15:25:18 -06:00
Justin Anderson
37bc3ad8fd Fixed typo, uninstalled to uninstall 2016-06-01 15:16:15 -06: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
Justin Anderson
5b23b91ac6 Integration test for gem module 2016-06-01 15:09:55 -06:00
rallytime
e68097445c Revert "Track down more unicode instances and add a test" 
This reverts commit 9729aed262.

This isn't the right approach here. This fix needs to be more narrow.
 2016-06-01 16:44:05 -04:00
Dan Slimmon
ef885c1b7e Added test mode to dockerng.volume_present. Resolves #33632. 2016-06-01 20:39:56 +00:00
Mike Place
9571dad678 Merge pull request #33677 from twangboy/fix_runas 
Pass kwargs to cmd.run
 2016-06-01 13:20:08 -07: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
onorua
09751ecb04 Make tornado raise error configurable (#32942) 2016-06-01 15:53:25 -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
rallytime
9729aed262 Track down more unicode instances and add a test 2016-06-01 13:47:29 -04:00
twangboy
4272afe0d5 Pass kwargs to cmd.run 2016-06-01 11:03:45 -06:00
Mike Place
d566ec4b31 Merge pull request #33648 from terminalmage/issue33529 
salt.modules.pkgng: Fix incorrect usage of _pkg()
 2016-06-01 09:37:46 -07: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
Mike Place
e92d6e214f Merge pull request #33646 from jfindlay/mac_tests 
Fix more tmp paths on MacOS
 2016-06-01 09:36:33 -07:00
Mike Place
9603cd3c0d Merge pull request #33656 from cachedout/fix_33076 
Fix indentation error in minion.py
 2016-06-01 09:23:20 -07:00
rallytime
ae332d1f88 Handle non-ascii package names in state.format_log 
Fixes #33605
 2016-06-01 09:58:47 -04:00
Mike Place
8259d4091f Fix indentation error in minion.py 
Refs #33076
 2016-05-31 16:55:18 -06: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
4e18ff7000 Restore grains context to renderers 
We were missing the proper grains dictionary in the renderer context. This restores it.

Closes #33614
 2016-05-31 14:53:32 -06:00
Erik Johnson
4ad80d29b6 salt.modules.pkgng: Fix incorrect usage of _pkg() 
Resolves #33529.
 2016-05-31 15:00:27 -05:00
Justin Findlay
c53a727c18 tests.runtests: use globally-determined tempdir 
This way, the the test logs will use the same temp dir as the rest of
the test suite.  On MacOS, for example, `$TMPDIR` is set to a path that
is too long for unix sockets on the system, so the `SYS_TEMP_DIR` is set
to `/tmp` to override this.
 2016-05-31 13:27:50 -06:00
Justin Findlay
8295b48459 test.integration: use hard /tmp on MacOS 
Otherwise, the tests will not work as `$TMPDIR` produces a path that is
too long for unix sockets on the platform.
 2016-05-31 13:27:50 -06:00
Nicole Thomas
b379dc57fd Merge pull request #33637 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-31 14:43:17 -04:00
rallytime
cd05d2bed1 Fix zypper test 2016-05-31 13:43:09 -04:00
Justin Findlay
9b0eb858a6 add note and workaround to release notes 2016-05-31 11:24:27 -06:00
Justin Findlay
17306bfc69 states.apache_*: readd and deprecate enable and disable 
Fixes f3a2b276.
 2016-05-31 11:24:27 -06:00
Nicole Thomas
b7230bded7 Back-port #33613 to 2016.3 (#33638) 
* Updated apache_module for backward compatible.

[This](f3a2b27671) introduced
a change of functions names that break this module when using Beryllium or older and upgrading to Boron.
Added here a deprecated warning in to order to advice users to migrate to new functions names. Also
documentation updated since was not updated in the original commit.

* Move warnutil from Carbon to Nitrogen

Let's give people a little more time to update their states.
 2016-05-31 13:14:23 -04: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
Mike Place
23506f8279 Merge pull request #33606 from danslimmon/ini-optionsabsent-33590 
Fixed ini.options_absent. Resolves #33590.
 2016-05-31 08:51:35 -07:00
Mike Place
44e8c9e720 Merge pull request #33604 from kev009/fix-33578 
Fix #33578 disks grain
 2016-05-31 08:17:36 -07:00
Wolodja Wentland
259529e25d Use correct state name in libvirt formula doc (#33631) 
The state module for libvirt has been renamed to 'virt' from
'libvirt' in 2016.3 and these references to the old name have not been
updated.
 2016-05-31 11:09:25 -04:00
Nicole Thomas
74a7b78e00 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - doc/conf.py
 2016-05-31 11:02:20 -04: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
Rolf Fokkens
1dd15a603b solve' TypeError: expected string or buffer' in json/decoder.py 2016-05-29 16:08:48 +02:00
Rolf Fokkens
eaf42ca892 solve AttributeError: 'module' object has no attribute 'exception' 2016-05-29 16:06:59 +02:00
Dan Slimmon
fb13852102 Fixed ini.options_absent. Resolves #33590. 2016-05-29 03:00:47 +00:00