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
71,027 Commits 24 Branches 182 Tags 341 MiB
a5cb6d0dd5
Commit Graph

71027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
a5cb6d0dd5 Move StringIO import to use six for salt.netapi.rest_cherrypy.app.py 2016-07-07 19:00:47 -06:00
Nicole Thomas
c6537a4ec6 Merge pull request #34538 from SaltyCharles/develop 
documentation typo
 2016-07-07 20:07:50 -04:00
SaltyCharles
7c939167e0 documentation typo 
fix typo in documentation
 2016-07-07 17:04:24 -07:00
SaltyCharles
cbcb854f7e Merge remote-tracking branch 'saltstack/develop' into develop 2016-07-07 17:01:48 -07:00
Mike Place
e550937e57 Merge pull request #34528 from kraney/boto_apigateway 
for options method, authorization_type should always be NONE, otherwi…
 2016-07-07 16:06:27 -06:00
Mike Place
bb0c7118ba Merge pull request #34502 from markuskramerIgitt/develop 
Windows installer build scripts will exit on error
 2016-07-07 16:05:31 -06:00
markuskramerIgitt
d87277ef89 setup.py will not print each individual file 2016-07-07 23:57:28 +02:00
Nicole Thomas
907f356770 Merge pull request #34525 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-07 17:53:24 -04:00
mrproper
752c83d248 Add apt key proxy support (#34407) 
* add missing proxy_ config options and defaults

* add support for http proxy for apt-key actions

* Fixes #34360.

* fix lint

* adjust defaults that are strings to empty strings
 2016-07-07 17:21:34 -04:00
Mike Place
ede3eaaca0 Merge pull request #34512 from techhat/azurenetrg 
Use correct resourcegroup for network interfaces
 2016-07-07 15:06:20 -06:00
Mike Place
2e53d038ce Merge pull request #34519 from SaltyCharles/develop 
update docker_events dependency reference
 2016-07-07 15:04:33 -06:00
Mike Place
d7acb758d9 Merge pull request #34483 from msciciel/systemd-xenserver-7 
Add support for systemd in latest XenServer 7.0 release which is now …
 2016-07-07 15:03:27 -06:00
Mike Place
c35b16a355 Merge pull request #34522 from thatch45/checkev 
Add check.event to thorium
 2016-07-07 15:02:02 -06:00
Mike Place
fedb4e0626 Merge pull request #34523 from thatch45/reject_keys 
Add support to reject keys
 2016-07-07 15:01:49 -06:00
rallytime
b4fc949b1a Pylint fix 2016-07-07 14:44:48 -06:00
Winston Liu
1f1e446309 for options method, authorization_type should always be NONE, otherwise CORS support will not work properly when other methods are using authorization_type AWS_IAM. 2016-07-07 13:34:07 -07:00
rallytime
86b7c71e09 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/glusterfs.py
  - salt/states/pkg.py
 2016-07-07 13:37:58 -06:00
Nicole Thomas
b9e87620f5 Merge pull request #34520 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-07 15:22:40 -04:00
Thomas S Hatch
bb83d24c1f Add support to reject keys 2016-07-07 13:16:20 -06:00
Thomas S Hatch
6a962ddfb1 Add check.event (and clean a print) 2016-07-07 12:58:46 -06:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-07-07 12:31:12 -06:00
SaltyCharles
055db2a098 update docker_events dependency reference 
Docker events depends on docker api >= 1.22 but current AWS ECS Docker
version is 1.9.1
 2016-07-07 11:09:32 -07:00
SaltyCharles
2430dce940 Merge remote-tracking branch 'saltstack/develop' into develop 2016-07-07 10:59:33 -07:00
Mike Place
a516f116d1 Merge pull request #34513 from cachedout/lower_loader_log 
Lower the log level for modules which cannot be loaded to trace
 2016-07-07 11:00:47 -06:00
Mike Place
733c5d00c0 Lower the log level for modules which cannot be loaded to trace 2016-07-07 10:57:51 -06:00
Mike Place
63f0451041 Merge pull request #34498 from rallytime/bootstrap-tutorial-doc-fix 
Use -O in the wget example in the bootstrap tutorial for the develop branch
 2016-07-07 10:30:46 -06:00
Mike Place
58f46eae15 Merge pull request #34499 from gtmanfred/2016.3 
remove unnecessary block parsing ip addrs for nova
 2016-07-07 10:23:46 -06:00
Mike Place
4c75d4f92b Integration test for grains data in templatized files (#34487) 
Refs #34433
 2016-07-07 12:16:35 -04:00
Nicole Thomas
3ebba020b6 Rename some unit test files by adding _test (#34503) 
These two test files are currently not running automatically on Jenkins.
Renaming these files will add them to the full runtests.py run.
 2016-07-07 12:05:08 -04:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505) 
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
 2016-07-07 12:04:27 -04:00
Joseph Hall
41eebcfa8f Use correct resourcegroup for network interfaces 2016-07-07 09:40:13 -06:00
markuskramerIgitt
44025e123e Merge branch 'develop' of https://github.com/markuskramerIgitt/salt into develop 2016-07-07 01:29:54 +02:00
markuskramerIgitt
eed5b61dad Completely remove Python and verify 2016-07-07 01:17:16 +02:00
markuskramerIgitt
d464447b86 Errors will stop the scripts 2016-07-07 00:18:01 +02:00
Shane Lee
17a3b23ff8 Use Python 2.7.12 for Windows Build (#34468) 2016-07-06 17:29:50 -04:00
rallytime
23c5739c3b Use -O in wget develop example in bootstrap tutorial 2016-07-06 15:23:39 -06:00
Daniel Wallace
019671d4c2 remove unnecessary block parsing ip addrs for nova 
This block shouldn't be necessary, we correctly parse the ipaddrs in the
NovaServer class now.  This was added in commit
47ecb7a150
 2016-07-06 16:23:21 -05:00
zer0def
6ce7cb9616 Gracefully handle non-XML output in GlusterFS execution module. (#34492) 
* Gracefully handle non-XML command output.

* Omit gluster command usage line.

* Remove unnecessary import.
 2016-07-06 17:12:30 -04:00
Shane Lee
858e5c1772 Update Python to 2.7.12 for Mac (#34493) 2016-07-06 17:10:53 -04:00
Justin Anderson
75299456be Use skipTest for network state integration test (#34489) 
* Updated skipTest to check for debian or redhat

* Removed skipIf import
 2016-07-06 13:43:09 -04:00
Nicole Thomas
0f3f87fbc5 Update dnsmasq.get_config docs to use correct config_file param. (#34488) 
Fixes #34261
 2016-07-06 13:29:07 -04:00
Nicole Thomas
95094c73ff Merge pull request #34486 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-06 13:28:31 -04:00
Thomas S Hatch
69f8e3b7f2 Merge pull request #34418 from isbm/isbm-inspector-fsdb 
Inspector: remove SQLite (entirely from here)
 2016-07-06 09:15:35 -06:00
rallytime
2b307b7ea1 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/file.py
  - tests/unit/states/file_test.py
 2016-07-06 09:12:25 -06:00
Krzysztof Pawłowski
6f1437813d Add support for systemd in latest XenServer 7.0 release which is now based on CentOS 7. 2016-07-06 13:29:35 +02:00
Bo Maryniuk
397258a2d4 Fix lint for Python3 compat 2016-07-06 10:09:14 +02:00
Bo Maryniuk
367aa2429b Fix lint 2016-07-06 10:09:14 +02:00
Bo Maryniuk
68d079bdb2 Add max option 2016-07-06 10:09:14 +02:00
Bo Maryniuk
2460d3856e Add "total" only. Add offset slicing (avoid truncated data) 2016-07-06 10:09:14 +02:00
Bo Maryniuk
b87969ae7e Add options to the query 2016-07-06 10:09:14 +02:00