rajvidhimar
a06d5e961d
Resolve merge conflicts
2017-03-06 14:11:26 +05:30
rajvidhimar
bdc8d2d196
Took care of comments
2017-03-06 13:00:07 +05:30
rajvidhimar
e047fd74ad
Test cases
2017-03-06 12:16:41 +05:30
rajvidhimar
47f9d32d80
Cover more code
2017-03-03 16:55:05 +05:30
rajvidhimar
c9c4ccaf3d
Restore original travis, clean lint
2017-03-03 16:05:05 +05:30
rajvidhimar
b00e702457
Making grains and facts related function compatable with new PyEZ changes
2017-03-03 12:52:27 +05:30
rajvidhimar
d464a954ac
More tests and changes in junos module
2017-03-03 12:48:24 +05:30
rajvidhimar
970060e0d4
Unit tests
2017-03-02 10:50:41 +05:30
rajvidhimar
6b9d89d706
Test cases
2017-02-27 12:44:23 +05:30
rajvidhimar
eac291d5c5
Refine travis 6
2017-02-24 11:07:36 +05:30
rajvidhimar
6402b7f732
Refine travis 5
2017-02-24 11:00:41 +05:30
rajvidhimar
ae844161d7
Refine travis 4
2017-02-24 10:51:57 +05:30
rajvidhimar
e773306015
Refine travis 3
2017-02-24 10:50:37 +05:30
rajvidhimar
c67f68e006
Dummy commit
2017-02-24 10:48:59 +05:30
rajvidhimar
45947c583c
Refine travis 2
2017-02-24 10:41:47 +05:30
rajvidhimar
9659c360f3
Refine travis 1
2017-02-24 10:35:09 +05:30
rajvidhimar
4cc6fd187b
Add junos test file
2017-02-24 10:19:24 +05:30
rajvidhimar
b570066c49
Travis try 5
2017-02-24 10:11:23 +05:30
rajvidhimar
4e0bdf28c2
Travis try 4
2017-02-24 09:58:33 +05:30
rajvidhimar
bcf9e587ec
Travis try 3
2017-02-23 15:58:16 +05:30
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
