valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,908 Commits 24 Branches 182 Tags 341 MiB
8f558a5f41
Commit Graph

66908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Findlay
8f558a5f41 tests...runtests_helpers: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:40 -06:00
Justin Findlay
0edd532add tests.integration: TMPDIR on MacOS gives too long paths 2016-03-30 21:09:39 -06:00
Justin Findlay
c74c241831 tests.integration: use os.path.realpath 
This reverts bf894c37, 6b99798b, and 4028d80e.  `os.path.realpath`
behaves identically to `salt.utils.abs_readlink` on the doc tests in
that function.
 2016-03-30 21:09:39 -06:00
Mike Place
231da529e0 Merge pull request #32224 from Ch3LL/add_grains_match_test 
Add grains match with wildcard tests
 2016-03-30 11:30:42 -06:00
Ch3LL
665468b5e8 fix pylint 2016-03-30 10:28:48 -06:00
Mike Place
4749fdc9ca Merge pull request #32222 from twangboy/win_user_expire 
Add `expire` as an option in user.present for Windows
 2016-03-30 08:49:12 -06:00
Ch3LL
1d46f01389 add more comments 2016-03-29 15:13:07 -06:00
Erik Johnson
bdfff068fb Improve wording on log message 2016-03-29 16:00:19 -05:00
Erik Johnson
8f75cf96ae Merge branch 'pr-31755' into 2016.3 2016-03-29 15:58:58 -05:00
Erik Johnson
a3ae49f9ba Merge branch 'fix-runbg' of https://github.com/The-Loeki/salt into 2016.3 2016-03-29 15:57:59 -05:00
Mike Place
4b985caf52 Merge pull request #32200 from twangboy/win_timelib 
Add timelib to windows pip dependencies
 2016-03-29 14:04:26 -06:00
Megan Wilhite
f34008988b add more matcher grains tests with wildcard 2016-03-29 19:59:13 +00:00
Mike Place
4ad92da5c4 Merge pull request #32214 from jtand/fix_test_kill 
Undo previous fix for a more correct fix for process_test.test_kill
 2016-03-29 13:15:20 -06:00
Mike Place
9f7740c023 Merge pull request #32216 from UtahDave/2016.3local 
Fix spelling error
 2016-03-29 13:13:58 -06:00
twangboy
9857fdd376 Add expire to user.present for windows 2016-03-29 12:57:31 -06:00
David Boucha
b48d0c6b5b Fix spelling error 2016-03-29 11:16:18 -06:00
Justin Anderson
b25e995efd Lint fix 2016-03-29 10:57:46 -06:00
Justin Anderson
5a57f2e1c6 Undo previous fix for a more correct fix for process_test.test_kill 2016-03-29 09:58:28 -06:00
twangboy
6984d5a075 Update pip and setuptools using req-pip.txt 2016-03-28 18:39:24 -06:00
twangboy
94354c45de Fix upgrade pip 2016-03-28 18:27:36 -06:00
twangboy
733ef7c3e0 Make VC Compiler for Python install silently 2016-03-28 18:23:26 -06:00
twangboy
33735ada22 Fix VC for Python install 2016-03-28 18:21:58 -06:00
twangboy
2f957409ad Add timelib and prereqs for compiling 
Add timelib==0.2.4 to req.txt
Add check for VC Compiler for python
Add installer for VC Compiler
 2016-03-28 18:15:00 -06:00
twangboy
662f55f40b Add expire to user.present 2016-03-28 16:48:24 -06:00
Nicole Thomas
f513e401d8 Merge pull request #32188 from jtand/fix_test_kill 
Fix test kill
 2016-03-28 16:38:48 -06:00
Nicole Thomas
b1a23756db Merge pull request #32191 from rallytime/bp-32138 
Back-port #32138 to 2016.3
 2016-03-28 16:38:32 -06:00
Tim Egbert
5f6384c707 Fixes the nova cloud driver so it can parse OpenStack ip addresses. 
Added code after the main ip address parsing that, if no ip addresses
are found, will attempt to parse the data structure as provided by
OpenStack (Kilo). The existing parsing, which works for Rackspace
is not affected.
 2016-03-28 14:53:17 -06:00
Nicole Thomas
be7277d338 Merge pull request #32178 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-28 12:58:28 -06:00
Justin Anderson
0f4f303380 Lint fix 2016-03-28 12:37:52 -06:00
rallytime
8531847e3f Pylint fix 2016-03-28 11:42:54 -06:00
Justin Anderson
a74bb9b67f Fix the process_test.test_kill failure in 2016.3 2016-03-28 11:33:55 -06:00
rallytime
9adc2facb2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-03-28 10:57:25 -06:00
Mike Place
d527eec228 Merge pull request #32156 from rallytime/mac-keychain-test 
Add integration tests for mac_keychain module
 2016-03-28 08:58:55 -06:00
Mike Place
a4aee8748e Merge pull request #32158 from twangboy/mac_path 
Add /opt/salt/bin to PATH in postinstall script for Mac
 2016-03-28 08:57:08 -06:00
Mike Place
1afb048801 Merge pull request #32163 from rallytime/fix-27605 
Update nacl.config docs to use key value instead of 'None'
 2016-03-28 08:46:40 -06:00
Mike Place
c08ba3f8a9 Merge pull request #32166 from vutny/fix-multiline-yaml-string-example 
`salt.states.file`: correct examples with multiline YAML string
 2016-03-28 08:45:32 -06:00
Mike Place
43ef524370 Merge pull request #32174 from sjorge/2016.3-smartos-change 
smartos state would show changes even if there were none
 2016-03-28 08:41:47 -06:00
Mike Place
dea112d96e Merge pull request #32175 from clinta/32075 
accept path as input to certificate managed state
 2016-03-28 08:36:55 -06:00
Clint Armstrong
5227bb3197 accept path as input to certificate managed state 2016-03-28 08:55:59 -04:00
Jorge Schrauwen
7950a88695 smartos state would show changes even if there were none 2016-03-28 12:53:56 +00:00
Denys Havrysh
34aaea93b4 Another indentation fix in salt.states.alternatives 2016-03-28 15:48:02 +03:00
Denys Havrysh
85d0576583 salt.states.file: correct examples with multiline YAML string 2016-03-28 15:48:02 +03:00
Nicole Thomas
f2e986cf65 Merge pull request #32168 from rallytime/lint-2015.8 
Lint 2015.8
 2016-03-27 12:26:50 -06:00
rallytime
ba6b19d72c Lint 2015.8 2016-03-27 12:26:02 -06:00
Nicole Thomas
ae472617af Merge pull request #32165 from terminalmage/issue31731 
Make __virtual__ for rhservice.py more robust
 2016-03-27 12:21:16 -06:00
Erik Johnson
559eb7da52 Make __virtual__ for rhservice.py more robust 
We already have an osrelease_info grain that provides a
versioninfo-style list. Using ``float()`` here is unnecessary and also a
brittle solution as it falls over when the verson contains a third part
(as an exception is raised since the string can no longer be evaluated as
a float).

Moreover, as we're not checking anything special for point releases, the
extra resolution provided by using a float is superfluous.

Additionally, this fixes incorrect logic which would result in this
module being loaded on Fedora 15, which uses systemd.

Fixes #31731.
 2016-03-26 22:35:24 -05:00
rallytime
e2d09f57dc Update nacl.config docs to use key value instead of 'None' 
Fixes #27605
 2016-03-26 20:56:51 -06:00
rallytime
635263ab1c Finish up mac_keychain tests 2016-03-26 20:30:22 -06:00
Ch3LL
b8f271bdc9 add mac_keychain test 2016-03-26 20:30:22 -06:00
Mike Place
63c8bf3542 Merge pull request #32160 from cachedout/issue_31944 
Fix beacon tutorial docs
 2016-03-25 16:32:51 -06:00