Commit Graph

67853 Commits

Author SHA1 Message Date
rallytime
b7accb0b3b Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/utils/aws.py
  - salt/utils/s3.py
2016-06-02 10:01:43 -04:00
lomeroe
e87c31037a backport #33599 to 2016.3 (#33682) 2016-06-02 09:38:16 -04:00
Erik Johnson
377556a221 Undo __repr__() and __str__() parts of d5a7dcc (#33688)
The repr string formatting flag is required here.

Resolves #33532.
2016-06-02 09:22:35 -04:00
Neil Williamson
778b290d94 Remove explicit PW column default from mysql_user (#33690) 2016-06-02 09:19:31 -04: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
c725854596 Merge pull request #33680 from rallytime/bp-32942
Back-port #32942 to 2016.3
2016-06-01 15:14:19 -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
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
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
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
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
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
Dan Slimmon
fb13852102 Fixed ini.options_absent. Resolves #33590. 2016-05-29 03:00:47 +00:00
Mike Place
e9a0c9304a Merge pull request #33603 from sjorge/2016.3-smartos-esky
allow esky packages to be build on base64 2015Q4
2016-05-28 17:36:02 -07:00
Kevin Bowling
e452ec514e Ignore cdroms in disks grain 2016-05-28 13:19:51 -07:00
Kevin Bowling
8bf0290024 Make disks grain datatyper more resilient 2016-05-28 13:06:25 -07:00
Jorge Schrauwen
1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg 2016-05-28 19:00:42 +02:00
Jorge Schrauwen
c85e03ecf7 allow for newer pyzmq in esky packages 2016-05-28 16:08:04 +00:00
Jorge Schrauwen
1620b8c0fa allow esky packages to be build on base64 2015Q4 2016-05-28 13:59:14 +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