valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,226 Commits 24 Branches 182 Tags 341 MiB
fa8d030ab7
Commit Graph

67226 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Kuzmenko
dc2a3b81ac Ignore lsb codename from os-release for newest RHEL 2016-03-29 20:02:30 +03: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
Nicole Thomas
ab8b70d985 Merge pull request #32212 from rallytime/bp-32197 
Back-port #32197 to 2015.8
 2016-03-29 09:50:58 -06:00
Nicole Thomas
200d82cc3e Merge pull request #32211 from rallytime/bp-32210 
Back-port #32210 to 2015.8
 2016-03-29 09:50:42 -06:00
Nicole Thomas
32da8d4c57 Merge pull request #32209 from rallytime/bp-32208 
Back-port #32208 to 2015.8
 2016-03-29 09:50:27 -06:00
Todd Wells
5fdd81ace9 documentation fix issue 31844 2016-03-29 09:11:29 -06:00
rallytime
7b9c05487c Whitespace fix. 2016-03-29 09:08:58 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
Todd Wells
79086f8f04 service.py documentation update for 32084 2016-03-29 09:08:58 -06:00
rallytime
777a2c4e83 Whitespace fix. 2016-03-29 09:05:03 -06:00
Todd Wells
e3db0640ec service.py documentation update for 32084 2016-03-29 09:05:03 -06:00
Mike Place
7154104591 Merge pull request #32204 from ticosax/label-from-image 
[dockerng] Consider labels carried by the image when comparing user defined labels.
 2016-03-29 08:39:22 -06:00
Jacob Hammons
596444e2b4 2015.8.8.2 release notes 
Adds banner notifiying user when they are viewing release notes for an old release
 2016-03-29 06:38:04 -06:00
Nicolas Delaby
c989ae5a7e Merge user defined labels with one carried by the image 2016-03-29 11:50:08 +02: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
Mike Place
5877a19f59 Merge pull request #32186 from rallytime/testing-docs 
Add some "best practices" information to test documentation
 2016-03-28 18:22:48 -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
Mike Place
6e0cb22c96 Merge pull request #32196 from jtand/cherrypy_pam_test_lint_fix 
Fixed pylint error in app_pam_test.py
 2016-03-28 17:59:42 -06:00
Nicole Thomas
b44adffc12 Merge pull request #32176 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-28 17:16:09 -06:00
Justin Anderson
bd3942e0fd Fixed pylint error in app_pam_test.py 2016-03-28 17:04:47 -06:00
rallytime
e8658697a6 Pylint fix for integration import 2016-03-28 16:56:22 -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
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -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
527bc3e491 Pylint fix 2016-03-28 11:24:45 -06:00
rallytime
9adc2facb2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-03-28 10:57:25 -06:00
rallytime
e9abd2d420 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/rh_service.py
 2016-03-28 10:51:23 -06:00
Mike Place
6b8b8b51c0 Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5 
Add integration tests for salt-api using pam eauth
 2016-03-28 10:06:36 -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
Nicole Thomas
230443be6c Merge pull request #32170 from gtmanfred/lxc_cloud_name 
add name for lxc for use with cloud cache
 2016-03-28 08:34:16 -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
Daniel Wallace
eb7d82e7be add name for lxc for use with cloud cache 
needed for use in `cache_node` in salt/utils/cloud.py
 2016-03-27 21:36:34 -05:00