valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
51,320 Commits 24 Branches 182 Tags 341 MiB
1e4b93dec9
Commit Graph

51320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Thomas S Hatch
871cdd72df Merge pull request #22781 from eliasp/develop.pillar_ldap-doc-fixes 
develop.pillar ldap doc fixes
 2015-04-17 09:06:47 -06:00
Thomas S Hatch
e4f7da9946 Merge pull request #22773 from analogbyte/develop 
smtp module: make multiple recipients work as expected
 2015-04-17 08:43:39 -06:00
Thomas S Hatch
6226d60abf Merge pull request #22776 from The-Loeki/patch-1 
Minor fix on clean
 2015-04-17 08:42:58 -06:00
Elias Probst
7b85666616 Fix alignment of code example. 2015-04-17 16:00:23 +02:00
Elias Probst
d685e49989 Added missing newline before code-block. 2015-04-17 16:00:23 +02:00
Ronald van Zantvoort
e07c4803a6 Minor fix on clean 
`re.match` matches from the start of the line, while we are actually looking for anywhere in the key ('system-serial' won't match on `match`, but will on `search`)
 2015-04-17 13:23:31 +02:00
Daniel Nägele
f4fe028d80 smtp module: make multiple recipients work as expected 2015-04-17 10:59:50 +02:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Colton Myers
84c8ae5a77 Merge pull request #13 from rallytime/basepi-merge-forward-develop 
Fully mock GPG mock class to allow gpg_tests to pass
 2015-04-16 22:45:04 -06:00
Justin Findlay
601e0ce012 Merge pull request #22764 from rallytime/pylint 
Pylint fixes for develop
 2015-04-16 22:31:51 -06:00
Justin Findlay
50611a3479 Merge pull request #22763 from terminalmage/issue22744 
Add clarification regarding saltutil.sync_modules behavior in state runs
 2015-04-16 22:29:10 -06:00
Justin Findlay
6c65b05568 Merge pull request #22765 from dmuntean/requests-to-instance-metadata-should-not-be-proxied 
Requests to AWS instance metadata should never be proxied
 2015-04-16 22:28:35 -06:00
rallytime
872974aefd Fully mock GPG mock class to allow gpg_tests to pass 2015-04-16 22:14:47 -06:00
Colton Myers
7bb5e0f5a0 Merge pull request #12 from rallytime/basepi-merge-forward-develop 
Fix remaining failing tests for merge forward
 2015-04-16 21:57:55 -06:00
Joseph Hall
1ce6d7ad3c Merge pull request #22757 from nmadhok/vmware-cloud-driver 
Adding vm_tools_upgrade() action to vmware salt cloud driver
 2015-04-16 21:48:45 -06:00
rallytime
ad99c8014c Mock __salt__ and call to salt.loader.render to fix win_repo test 2015-04-16 21:22:03 -06:00
Justin Findlay
c82339ba74 fix saltmod.function unit test 2015-04-16 21:09:59 -06:00
Dmitri Muntean
293fef2f96 Requests to AWS instance metadata should never be proxied 
Enforce usage of no proxies for requests that query instance metadata
service in AWS. Trying to access this URI via proxy always returns 404.
This caters for the case when proxy settings are picked up from environment,
but NO_PROXY is not correctly set.
 2015-04-17 11:32:10 +10:00
rallytime
d6bc395fe6 Pylint fixes for develop 2015-04-16 19:29:28 -06:00
Erik Johnson
8768e51128 Add note about using module_refresh to refresh modules in state run 2015-04-16 20:18:25 -05:00
Erik Johnson
e51a8e0e4a Add external anchor for "reloading modules" section of state docs 2015-04-16 20:17:25 -05:00
Nitin Madhok
745692dccf Lint 2015-04-16 19:56:51 -04:00
Nitin Madhok
2e0e6a0ef8 Renaming vm_tools_upgrade() to upgrade_tools() 2015-04-16 19:56:05 -04:00
Colton Myers
728e74c921 Better return data for mocked saltutil.cmd for saltmod.function 2015-04-16 17:46:32 -06:00
Colton Myers
a8a5ee5fa6 Allow proto or protocol in iptables 2015-04-16 17:30:37 -06:00
Colton Myers
e3be4bf704 Mock pillar_pcre for the mine tests 2015-04-16 17:18:50 -06:00
Colton Myers
40a6ed45eb Fix puppet test to mock cmd.run_all with return value including retcode 2015-04-16 17:18:50 -06:00
Colton Myers
fd036278e8 Fix iptables test_flush 2015-04-16 17:18:50 -06:00
Colton Myers
7ab3c441e6 Merge pull request #11 from rallytime/basepi-merge-forward 
Chang variable to empty string if it's None
 2015-04-16 17:04:08 -06:00
rallytime
1f59e1386e Chang variable to empty string if it's None 
To prevent a stacktrace when using os.path.exists
 2015-04-16 17:01:22 -06:00
Colton Myers
5b83dc7bad Merge pull request #22758 from rallytime/doc_sidebar 
Change latest release version in doc sidebar
 2015-04-16 16:20:31 -06:00
Nitin Madhok
55e63b9013 Lint fix 2015-04-16 18:04:09 -04:00
Nitin Madhok
72c5152ac8 Refactor vm_tools_upgrade() 2015-04-16 17:54:43 -04:00
rallytime
662593c902 Change latest release version in doc sidebar 2015-04-16 15:00:36 -06:00
Colton Myers
5deff645e8 Remove unused import 2015-04-16 14:06:42 -06:00
Colton Myers
b943eb5ab6 How did this sneak in there? 2015-04-16 14:05:50 -06:00
Nitin Madhok
d024374d2e Merge branch 'vmware-cloud-driver' of github.com:nmadhok/salt into vmware-cloud-driver 2015-04-16 16:05:00 -04:00
Nitin Madhok
a59417d6d2 Merge pull request #2 from rmgoodberlet/vmware-cloud-driver 
Adding vm_tools_upgrade() to be able to upgrade vmware tools on a specified vm.
 2015-04-16 16:01:14 -04:00
Ralph M Goodberlet
ebf7add2ff Removing unwanted newlines and justified comments to code blocks. 2015-04-16 16:00:38 -04:00
Ralph M Goodberlet
9ec95c23d9 Adding vm_tools_upgrade() to be able to upgrade vmware tools on a specified vm. 2015-04-16 15:46:22 -04:00
Colton Myers
e235c9759b Mock config.option for pagerduty tests 2015-04-16 12:36:40 -06:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00
Colton Myers
11356cb0c6 Use print_function 2015-04-16 12:16:44 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
b6e803910f Merge pull request #22753 from thatch45/doc_clear 
fix some bad sls data in a doc
 2015-04-16 11:58:17 -06:00
Thomas S Hatch
58617f9a7b Merge pull request #22729 from nmadhok/vmware-cloud-driver 
Adding list_nodes_select(), create_datacenter() and create_cluster() in vmware salt cloud driver
 2015-04-16 11:54:56 -06:00
Thomas S Hatch
b20dbb822b fix some bad sls data in a doc 2015-04-16 11:49:35 -06:00
Colton Myers
8d1e9e8010 Merge pull request #22752 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-04-16 11:47:40 -06:00
Colton Myers
ccfcedbf6b Go back to the 2015.2 version of salt.7 2015-04-16 11:46:30 -06:00