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
69,677 Commits 24 Branches 182 Tags 341 MiB
beea8cc376
Commit Graph

69677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EYJ
beea8cc376 Fix millisecond formatting to avoid 1000 as four-digit milliseconds 2016-06-02 17:43:27 +02:00
plastikos
e5877113bb imported patch improvement-trivial_docstring (#33692) 2016-06-02 10:47:25 -04:00
Mike Place
178feef40f Merge pull request #33660 from hrumph/develop 
Addition of only_on_pending_reboot param to reboot and shutdown functs + other minor fixes
 2016-06-01 14:04:55 -07:00
Mike Place
4123298538 Merge pull request #33657 from jeanpralo/dockerng-get-default-docker-auth 
use default docker auth file as prior auth system
 2016-06-01 14:02:10 -07:00
Mike Place
05d2951246 Merge pull request #33601 from mchugh19/slack-fix 
Fix slack engine to run on python2.6
 2016-06-01 13:48:19 -07:00
Jean Praloran
90dfe751b3 fix lint problem 2016-06-02 08:39:55 +12:00
Jean Praloran
81239c6a93 fix error catching when reading the file 2016-06-02 08:39:55 +12:00
Jean Praloran
a39b4861a4 use default docker auth file as prior auth system 2016-06-02 08:39:54 +12:00
Mike Place
64ba252256 Merge pull request #33650 from terminalmage/issue29954 
Feature: add per-saltenv configuration parameter support
 2016-06-01 13:34:30 -07:00
Mike Place
d5ff1bc21e Merge pull request #33663 from ksvasan/develop 
Fix the unlock bug with zk_concurrency module
 2016-06-01 11:59:03 -07:00
Mike Place
9d433da5fb Merge pull request #33641 from glomium/issue33588 
check rabbitmq version and use different api to validate a users pass…
 2016-06-01 10:28:56 -07:00
Mike Place
e37c6e3dd0 Merge pull request #33644 from mchugh19/hipchat-normalize-trigger 
Handle trigger the same way as slack engine
 2016-06-01 09:58:27 -07:00
Mike Place
bf487913ea Merge pull request #33666 from meaksh/develop 
exportdb command for udev module and tests (develop branch)
 2016-06-01 09:56:35 -07:00
Mike Place
6bd7faa942 Merge pull request #33617 from eyj/wait_for_query 
Add wait_for_successful_query to module and state
 2016-06-01 09:49:20 -07:00
Mike Place
9a51263ca8 Merge pull request #33673 from cachedout/lint_33610 
Lint servicenow module
 2016-06-01 09:47:32 -07:00
Mike Place
1beb3f44dc Lint servicenow module 
Refs #33610
 2016-06-01 10:43:32 -06:00
Mike Place
1c565229ba Merge pull request #33658 from bodhi-space/develop 
INFRA-1640 - add MakoStack ext_pillar module, for those of us who fin…
 2016-06-01 09:40:37 -07:00
Pablo Suárez Hernández
f9b6858cf9 unit tests for udev execution module 
tests improvements
 2016-06-01 12:23:30 +01:00
Pablo Suárez Hernández
d88bc7f948 exportdb command for udev execution module 
isbm refactor for _parse_udevadm_info
 2016-06-01 12:23:19 +01:00
ksvasan
71588a96df Enable hostname as default identifier for zk_concurrency to avoid unlock bug 2016-06-01 12:02:55 +05:30
ksvasan
9c8a8e3358 Merge remote-tracking branch 'upstream/develop' into develop 2016-06-01 11:50:06 +05:30
Michael Walton
0c5f68c15d Lint fixes 2016-06-01 00:47:16 -04:00
Michael Walton
92566133e7 1) addition of only_on_pending_reboot paramater 
to shutdown and reboot functions
2) bugfix in shutdown command (changed seconds to timeout).
   I believe this was an uncaught clerical error.
3) De-linting fixes (e.g. changed variable "c" to "conn" in various places)
   and added lint disable flags here and there
 2016-06-01 00:01:11 -04:00
Tom Williams
28974e1dd1 INFRA-1640 - remove unused imports 2016-05-31 22:23:45 -04:00
Tom Williams
052033ae7f INFRA-1640 - add MakoStack ext_pillar module, for those of us who find Jinja just a little too un-Python-like... 2016-05-31 19:52:28 -04:00
Sebastian Braun
031c24b4c8 pylint W0141, W0702 2016-05-31 22:46:24 +02:00
Erik Johnson
c32f432347 Add documentation for per-saltenv configuration parameters 2016-05-31 15:28:21 -05:00
Erik Johnson
62e59e2b60 Pass per-remote-only params for gitfs 2016-05-31 15:28:21 -05:00
Erik Johnson
ee620af665 Rework config loading to support per-saltenv config parameters 2016-05-31 15:28:20 -05:00
Erik Johnson
2bd1ac6acc Add gitfs_saltenv default config values 2016-05-31 15:28:17 -05:00
Erik Johnson
f9c54f41c8 Add recursion, callbacks to salt.utils.repack_dictlist() 2016-05-31 14:48:21 -05:00
Christian McHugh
f6030b6f32 Handle trigger the same way as slack engine 2016-05-31 14:15:47 -05:00
Christian McHugh
5b1af94ddd remove the unnecessary double trigger 2016-05-31 14:05:58 -05:00
Nasenbaer
4905e3e1ff Workaround for pylint bug 
https://www.logilab.org/ticket/3207
 2016-05-31 20:26:01 +02:00
Christian McHugh
c7c555db05 fix spacing lint error 2016-05-31 13:23:43 -05:00
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
Sebastian Braun
2ad704e26b check rabbitmq version and use different api to validate a users password 2016-05-31 13:02:33 +02: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