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
78,536 Commits 24 Branches 182 Tags 341 MiB
4384852054
Commit Graph

78536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rajvidhimar
4384852054 Travis try 2 2017-02-23 15:52:10 +05:30
rajvidhimar
23964ead68 Travis try 1 2017-02-23 15:42:56 +05:30
rajvidhimar
4afd110bf1 travis original 2017-02-23 15:04:17 +05:30
rajvidhimar
cc8c2cd124 change travis 2017-02-23 14:36:39 +05:30
rajvidhimar
2010e30d3c fix doc 2017-02-23 14:25:01 +05:30
rajvidhimar
b7d6ab2cf5 Some bug fixes 2017-02-23 14:21:52 +05:30
vnitinv
88c23f8168 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-22 23:05:36 +05:30
Nitin Kumar
53befdee35 Merge pull request #15 from nembery/junos_syslog_daemon_bug_001 
Junos syslog daemon bug 001
 2017-02-22 23:04:15 +05:30
Nitin Kumar
c00a99673a Merge pull request #14 from nembery/develop 
allow extra template variables to be passed into install_config
 2017-02-22 23:02:41 +05:30
Mike Place
5c53b6d24a Merge pull request #39558 from DSRCorporation/bugs/39368_broken_failover 
Don't use `__salt__` in salt.utils.minion. Removed unneeded function.
 2017-02-22 09:51:53 -07:00
Mike Place
72fcf9dcee Merge pull request #39556 from s0undt3ch/features/py3 
Require SaltPyLint >= v2017.2.22
 2017-02-22 09:50:56 -07:00
Mike Place
6b4960031e Merge pull request #39559 from mathieubouchard/develop 
Use the new hash syntax for file.patch
 2017-02-22 09:50:20 -07:00
Mathieu Bouchard
c6fb1526aa Use the new hash syntax for file.patch 
Fixes issue https://github.com/saltstack/salt/issues/39512
 2017-02-22 09:11:12 -05:00
Dmitry Kuzmenko
c0d80488d2 Don't use __salt__ in salt.utils.minion. Removed unneeded function. 2017-02-22 15:32:20 +03:00
Pedro Algarvio
1dd7d8d88f
Require SaltPyLint >= v2017.2.22 
Minimal Python version for develop is now 2.7
 2017-02-22 12:15:31 +00:00
Pedro Algarvio
4a96490b61 Merge pull request #39537 from s0undt3ch/features/py3 
More Py3 compatibility fixes
 2017-02-22 10:21:00 +00:00
Pedro Algarvio
0b3071ee3a
.iter<items|keys|values>() Py3 compatibility 2017-02-22 10:20:26 +00:00
Tom Williams
c3efbbaf84 Fix a couple of small-ish issues in salt/states/boto3_route53.py (#39522) 
* INFRA-1963 - bad logic when checking if an update is due

* INFRA-1963 - only pass VPC related params if they're valid
 2017-02-21 17:07:13 -07:00
Nicole Thomas
836d2a08d0 Merge pull request #39541 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-21 16:56:04 -07:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
Erik Johnson
dc8f578447 Merge pull request #39534 from rallytime/fix-pkg-function-specs 
Fix breakage in aptpkg and dpkg execution modules
 2017-02-21 14:31:14 -06:00
Denys Havrysh
1d0d7b24c1 Upgrade SaltTesting to run test suite for 2016.11 and add SaltPyLint (#39521) 2017-02-21 13:30:16 -07:00
Mircea Ulinic
400d49e1ad Small docfix for the salt runner (#39517) 
* Small docfix for the salt runner

* Strip trailing whitespace
 2017-02-21 12:27:12 -07:00
rallytime
d34a8fe9dc Fix breakage in aptpkg and dpkg execution modules 
The change in #39418 added a keyword argument before the *args
definition, which doesn't work. We need to use **kwargs after
the *names or *packages references.

This PR updates the affected functions to remove the ``failhard=True``
definitions to use **kwargs instead, cleans **kwargs, retrieves the
"failhard" option, and then errors if additional, unexpected kwargs
are passed in.
 2017-02-21 10:58:39 -07:00
Pedro Algarvio
7eff26ece8
Python 3 compatibility 2017-02-21 12:07:03 +00:00
Pedro Algarvio
307a2bcaff
Python 3 compatibility 2017-02-21 12:05:52 +00:00
Mike Place
9d379c0bbf Merge pull request #39470 from cetanu/develop 
Bugfix PR #39410
 2017-02-19 11:10:05 -07:00
Mike Place
75021cdb4c Merge pull request #39406 from thatch45/parallel_states 
Parallel states
 2017-02-19 10:58:35 -07:00
Mike Place
92cc2db1fd Merge pull request #39474 from terminalmage/deprecate-dockerio 
Move legacy docker state/exec module to salt-contrib, rename dockerng to docker
 2017-02-19 10:56:58 -07:00
Mike Place
2dbc0b4a72 Merge pull request #39496 from mephi42/xz-l-t 
Use xz -t instead of xz -l to test if archive is packed with xz
 2017-02-19 10:47:48 -07:00
Erik Johnson
ec2b617a5d Fixes for docker tests 
These tests were failing because of improper mocking. The mocks were
assigned to the __salt__ dunder but we should have been patching the
attributes of the docker execution module directly.
 2017-02-18 21:58:25 -06:00
Erik Johnson
5e7c3b4b64 docker: make docker-exec the default execution driver 
Docker 1.13.1 removed the ExecutionDriver from the ``docker info``
return data. This causes all attempts to run commands in containers to
fall back to the old lxc-attach driver, which is incompatible with newer
docker releases.
 2017-02-18 21:58:25 -06:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
mephi42
53d81f3804 Use xz -t instead of xz -l to test if archive is packed with xz 
lzma v4, which comes with CentOS 6, does not support -l
 2017-02-18 22:49:23 +01:00
Vasili Syrakis
1cbc4b0b6f Merge branch 'develop' into develop 2017-02-18 11:29:26 +11:00
Vasili Syrakis
9e3488e576 disk_label is undefined; should be device.deviceInfo.label 2017-02-18 11:27:37 +11:00
Mike Place
deba6d2655 Merge pull request #39367 from gtmanfred/develop 
add extmod_blacklist to make it easier to remove modules
 2017-02-17 16:57:44 -07:00
Mike Place
13b254aa7b Merge pull request #39363 from cloudflare/napalm_px 
New execution module: napalm helpers
 2017-02-17 16:55:10 -07:00
Mike Place
e4c71683d9 Merge pull request #39370 from twangboy/gate_win_utils 
Gate win_osinfo and winservice
 2017-02-17 16:53:58 -07:00
Mike Place
25dabbe21e Merge pull request #39399 from thatch45/req_in_sls 
This makes the sls requisite_in system work
 2017-02-17 16:43:23 -07:00
Thomas S Hatch
3a78c49b61 Fix some obvious oversights 2017-02-17 16:07:52 -07:00
Mike Place
179e143272 Merge pull request #39385 from curiositycasualty/develop 
modules.file: Return true when a symlink is already in desired state
 2017-02-17 15:24:53 -07:00
Mike Place
0c411bfbb0 Merge pull request #39430 from s0undt3ch/features/py3 
More Py3 Fixes
 2017-02-17 15:24:12 -07:00
Mike Place
e7cbf8de2f Merge pull request #39488 from mchugh19/develop 
Add generic zabbix run_query
 2017-02-17 15:22:43 -07:00
Mike Place
a3e71b6cce Merge pull request #39486 from twangboy/win_remove_orphaned 
Remove orphaned function list_configurable_policies
 2017-02-17 15:21:49 -07:00
Mike Place
10808f47ab Merge pull request #39489 from twangboy/win_unit_tests 
Set hard limit on Windows
 2017-02-17 15:13:07 -07:00
twangboy
77d3a584a4 Set hard limit on Windows 2017-02-17 13:52:27 -07:00
Pedro Algarvio
32f6954924
Encode the cipher back to a string for proper error handling 2017-02-17 20:48:58 +00:00
Pedro Algarvio
2ed05ab399
We really don't need to be root to run these 2017-02-17 20:48:58 +00:00