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
69,628 Commits 24 Branches 182 Tags 341 MiB
2075ddb9cb
Commit Graph

69628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
2075ddb9cb Merge pull request #33597 from jfindlay/win_finger 
grains.core.os_data: add windows osfinger, osrelease_info
 2016-05-31 10:46:47 -07:00
Mike Place
36dfdf54d6 Merge pull request #33640 from techhat/armstorage 
Add listing of storage accounts and containers
 2016-05-31 10:21:44 -07:00
Mike Place
962bdc8c32 Merge pull request #33599 from lomeroe/fix_s3_large_file_download 
Fix s3 large file download
 2016-05-31 10:07:33 -07:00
Mike Place
ba15a4ba43 Merge pull request #33560 from SaltyCharles/develop 
add salt:// support to salt-cloud for .map files
 2016-05-31 10:06:35 -07:00
Joseph Hall
fe0fe762dd Lint 2016-05-31 10:31:00 -06:00
Mike Place
9ed809f557 Merge pull request #33610 from tonybaloney/servicenow_fix 
Change the ServiceNow module's non_structured_query method to support kwargs
 2016-05-31 09:23:18 -07:00
Mike Place
1146cfe254 Merge pull request #33607 from mchugh19/hipchat 
add hipchat engine
 2016-05-31 09:18:42 -07:00
Mike Place
e2cf84f301 Merge pull request #33594 from hrumph/develop 
Fix unicode handling from last PR
 2016-05-31 09:01:20 -07:00
Mike Place
9aaf9d8434 Merge pull request #33612 from jeanpralo/fix-dockercompose-version-check 
fix dockercompose version check
 2016-05-31 08:55:07 -07:00
Mike Place
de26ec155a Merge pull request #33625 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider improvements
 2016-05-31 08:52:55 -07:00
Joseph Hall
c540cdc1e6 Update depends docs 2016-05-31 09:42:27 -06:00
Joseph Hall
beccdac342 Add listing of storage accounts and containers 2016-05-31 09:39:08 -06:00
Mike Place
d43a9fd193 Merge pull request #33613 from abednarik/abednarik_apache_module_backward_compatible 
Updated apache_module for backward compatible.
 2016-05-31 08:12:06 -07:00
Ethan Devenport
668800f76c ProfitBricks cloud provider improvements. 
* Added disk_type setting to the profile config and updated documentation.
* Added a config option for setting the provisioning wait_for_timeout and updated documentation.
* Refactored image selection by name.
* Print API request ID in debug logging output.
* Made profile size property optional by allowing predefined size or custom cores/ram/disk.
 2016-05-31 02:15:12 +00:00
Christian McHugh
a691593845 Just like the slack engine, remove the special handling of aliases 2016-05-30 00:20:58 -05:00
Michael Walton
4e2351bca5 fix lint 2016-05-29 23:21:46 -04:00
Michael Walton
3a5ffff90f More fixes to unicode handling (which I botched originally) 
Fixed documentation paragarphing throughout module
and added lot's of examples for set_value function
 2016-05-29 21:55:22 -04:00
Jean Praloran
c5111c8d37 do not log if version does not meet requirement, return False 2016-05-30 09:36:01 +12:00
abednarik
7d096f7954 Updated apache_module for backward compatible. 
[This](f3a2b27671) introduced
a change of functions names that break this module when using Beryllium or older and upgrading to Boron.
Added here a deprecated warning in to order to advice users to migrate to new functions names. Also
documentation updated since was not updated in the original commit.
 2016-05-29 17:23:27 -03:00
Jean Praloran
911f2a225c fix dockercompose version check 2016-05-30 08:02:25 +12:00
Mike Place
055c9bd38c Merge pull request #33518 from tonybaloney/fix_libcloud_bug 
Fix libcloud bug #33367
 2016-05-29 12:51:37 -07:00
Christian McHugh
f1e98a2856 slightly simplify setup 2016-05-29 11:52:44 -05:00
anthony-shaw
83461e0940
fixes for docs in servicenow module and more tests 2016-05-29 21:03:33 +10:00
anthony-shaw
92c1b7b9cf Merge remote-tracking branch 'salt/develop' into develop 2016-05-29 20:42:07 +10:00
Christian McHugh
4ee1c63541 add hipchat engine 2016-05-29 03:04:56 -05:00
Michael Walton
9e2a687984 undo accidental commit 2016-05-29 02:22:21 -04:00
Michael Walton
8304613988 fix problem where a value of None what being translated literally to the 
unicode string u"None".
 2016-05-29 02:10:02 -04:00
Mike Place
a466fffc70 Merge pull request #33602 from glomium/patch-1 
Typo in states/virtualenv_mod.py
 2016-05-28 17:28:47 -07:00
Thomas S Hatch
c5b3cf6b05 Merge pull request #33591 from techhat/clouderror 
Log if the cache hits an error, but don't stop working
 2016-05-28 08:55:49 -06:00
Sebastian Braun
dbcc57b357 Typo in states/virtualenv_mod.py 
'str' object has no attribute 'formar'
 2016-05-28 05:35:39 +02:00
Ethan Moore
dedb02492d 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-05-27 23:04:01 +00:00
Joseph Hall
7b85b9cd13 Change log to warn 2016-05-27 16:31:29 -06:00
Ethan Moore
1d26b124a2 first go at having requests use streaming for get/put requests 2016-05-27 21:40:31 +00:00
Justin Findlay
a4ba20aca8 grains.core.os_data: add windows osfinger, osrelease_info 2016-05-27 14:44:33 -06:00
Michael Walton
a8ae5998be All use of the win32api library should be unicode 2016-05-27 14:40:18 -04:00
SaltyCharles
827e09f4d2 add deepcopy instead of copy 2016-05-27 10:15:44 -07:00
SaltyCharles
0924c5d16e rebase salt-cloud init 2016-05-27 10:14:34 -07:00
SaltyCharles
963dfa6dfc Merge remote-tracking branch 'saltstack/develop' into develop 
# Conflicts:
#	salt/cloud/__init__.py
 2016-05-27 10:05:13 -07:00
Mike Place
17d278c77b Merge pull request #33566 from aneeshusa/document-cmd-creates-list 
Document passing a list to creates in cmd states
 2016-05-27 09:49:06 -07:00
Mike Place
2425c7c13b Merge pull request #33559 from pstengel/bugfix/contents_delimiter 
Actually implement contents_delimiter
 2016-05-27 09:42:37 -07:00
Joseph Hall
365ee8e6ab Log if the cache hits an error, but don't stop working 2016-05-27 10:41:29 -06:00
Mike Place
3b4e47ba0c Merge pull request #33569 from martinhoefling/orchestrate_output 
Repair and sort orchestrate runner output
 2016-05-27 09:33:17 -07:00
Mike Place
1f3f5a805e Merge pull request #33577 from akissa/add-x509-support-for-validating-bundled-certificates 
Allow validation of bundled certificates
 2016-05-27 09:32:19 -07:00
Mike Place
ec420ff658 Merge pull request #33567 from m03/add-communities-to-win_snmp 
Add communities to win_snmp
 2016-05-27 09:29:46 -07:00
Mike Place
aa4f9cf59c Merge pull request #33574 from babilen/doc-states-tut-fix-grain-target-expr 
Adjust target expression in state tutorial
 2016-05-27 08:09:08 -07:00
Mike Place
3c49beaa57 Merge pull request #33564 from druonysus/suse-os-family 
simple fix - change Suse to SUSE
 2016-05-27 08:06:03 -07:00
Mike Place
8600fb7ace Merge pull request #33579 from akissa/fix-minor-doc-typo-in-x509-module 
Fixed documentation typo in x509 module
 2016-05-27 07:58:35 -07:00
Michael Walton
af37bd72c2 Revert unicode handling to what it was earlier. The mistake was made 
due to a misunderstanding of the win32api source code
 2016-05-27 10:38:27 -04:00
Andrew Colin Kissa
e7aea19c81 Fixed documentation typo in x509 module 2016-05-27 13:52:34 +02:00
Andrew Colin Kissa
ad41aa8c59 Allow validation of bundled certificates 
Currently it is not possible to validate bundled
certificates as the get_pem_entry function expects
only one certificate in the file.

This change allows for the first certificate in the
file to be extracted and validated.
 2016-05-27 13:31:32 +02:00