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
67,927 Commits 24 Branches 182 Tags 341 MiB
669aa92d59
Commit Graph

67927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
56eab363ff Merge pull request #33723 from rallytime/bp-33641 
Back-port #33641 to 2016.3
 2016-06-03 09:07:53 -07:00
Mike Place
c2b970789c Merge pull request #33748 from ticosax/adjust-api-version-host-config 
HostConfig has been introduced by docker api version 1.15
 2016-06-03 08:28:40 -07:00
Mike Place
e08c685a6c Merge pull request #33745 from eliasp/2016.3-typo-privilages-privileges 
Typo (`privilages` → `privileges`)
 2016-06-03 08:14:37 -07:00
Nicolas Delaby
134e4a9abf HostConfig has been intoriduced by docker api version 1.15 2016-06-03 11:46:55 +02:00
Elias Probst
646bc426c6
Typo (privilages → privileges) 2016-06-03 09:54:56 +02:00
Daniel Hobley
636f4c00f0 Make sure we only use GetConnection if we are using a proxy salt minion 2016-06-03 08:57:53 +02:00
Sebastian Braun
77a51a00a3 pylint W0141, W0702 2016-06-02 17:34:32 -04:00
Sebastian Braun
f8518939a7 check rabbitmq version and use different api to validate a users password 2016-06-02 17:34:26 -04:00
Mike Place
5f4c6902aa Merge pull request #33562 from jfindlay/apache_funcs 
states.apache_*: readd and deprecate enable and disable
 2016-06-02 12:51:37 -07:00
rallytime
59bd51f4c8 Update test to correct iteration 2016-06-02 14:32:21 -04:00
Mike Place
d3253effe9 Merge pull request #33659 from danslimmon/dockerng-dryrun-33632 
Added test mode to states.dockerng. Resolves #33632.
 2016-06-02 10:45:49 -07:00
Mike Place
1d6582b659 Merge pull request #33696 from clburlison/2016.3-pkg-fix 
Update mac native package for upcoming release
 2016-06-02 10:44:01 -07:00
Mike Place
78966f5f30 Merge pull request #33710 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-06-02 09:19:00 -07:00
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
rallytime
a580d1c6e0 Add unit test for format_log change 2016-06-02 09:26:39 -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
Daniel Hobley
64e9334d56 Fix a bug with self signed certificates and creating a new VM 
- Removed the GetConnection call as all this does is cause connections that are connected with the overrides for "CERTIFICATE_VERIFY_FAILED" to not be able to connect the 2nd time the si is fetched
 2016-06-02 09:20:14 +02:00
Daniel Hobley
7834aeda7d Fix a bug when creating a new VM and changing the network info 
- This commit fixes a small bug where the network adapter won't be connected at startup of the VM and therefore can never be contacted by the salt master, the fix is to just simply apply the same config changes once the clone is completed
 2016-06-02 09:18:31 +02:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release 
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
 2016-06-01 23:32:23 -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
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
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
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