valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,611 Commits 24 Branches 182 Tags 341 MiB
36b2eee8f7
Commit Graph

82611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
36b2eee8f7 Merge pull request #41554 from KevinPlus3/add_chattr 
Add chattr functionality.
 2017-06-06 13:22:37 -05:00
garethgreenaway
872ba1f8ed Merge branch 'develop' into add_chattr 2017-06-06 10:07:25 -07:00
Nicole Thomas
bd767f77f9 Merge pull request #41588 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-06 09:08:22 -06:00
rallytime
9e05c1cd06 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-05 13:39:01 -06:00
Mike Place
d31e687c79 Merge pull request #41582 from terminalmage/py3-tests 
More debug logging to troubleshoot failing manage runner tests in Python 3
 2017-06-05 12:11:10 -05:00
Erik Johnson
e0f00a2f84 More debug logging to troubleshoot failing manage runner tests in Python 3 
Either the get_cli_event_returns generator is not returning events, or
the events being yielded otherwise are evaluating as False. This line of
debugging code will help determine which is the case.
 2017-06-05 11:14:21 -05:00
Nicole Thomas
5234ff2f87 Merge pull request #41550 from cloudflare/empty-pass 
More flexible options for the napalm proxy
 2017-06-02 21:11:37 -06:00
Nicole Thomas
1b5d69365f Merge pull request #41542 from rongzeng54/develop 
fixed salt-minion initd file bug
 2017-06-02 21:09:49 -06:00
freckledkev
a3a6085629 Adding lsattr/chattr functionality to Salt. 2017-06-02 21:42:52 +00:00
Mike Place
da8af9ca34 Merge pull request #41483 from tsaridas/clean_job_cache 
clear jobs directories
 2017-06-02 12:29:05 -05:00
Mike Place
310184a549 Merge pull request #41505 from coredumb/vault_support_minion_id 
salt/pillar/vault.py: Support having minion_id in vault path
 2017-06-02 12:26:21 -05:00
Nicole Thomas
706d3ccf69 Merge pull request #41560 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-02 11:19:05 -06:00
Mike Place
73365c38a8 Merge branch 'develop' into develop 2017-06-02 12:03:56 -05:00
Mike Place
33819e9476 Merge pull request #41544 from cloudflare/reconnect-on-err 
Reconnect and re-execute when receiving disconnect
 2017-06-02 11:34:55 -05:00
Mike Place
e97998fa52 Merge pull request #41564 from terminalmage/py3-tests 
Add debug logging for manage.up/down
 2017-06-02 11:20:01 -05:00
Erik Johnson
896a583f83 Add debug logging for manage.up/down 
This adds some debug logging which we can hopefully use to troubleshoot
https://github.com/saltstack/salt-jenkins/issues/341.

Also, this ensures that the lists of up/down minions are always sorted.
This will make future testing more reliable.
 2017-06-02 11:14:45 -05:00
Mike Place
d59ccb7e96 Merge pull request #41563 from rallytime/stale-days 
Reduce the number of days an issue is stale by 25
 2017-06-02 11:03:00 -05:00
Mike Place
c8fac3d735 Merge pull request #41555 from rklaren/salt-cloud-libvirt-tweaks 
Salt cloud libvirt tweaks
 2017-06-02 11:02:11 -05:00
rallytime
c7260b4de5 Reduce the number of days an issue is stale by 25 
Let's ease into a more reasonable `daysUntilStale` value. This
updates the time an issue will be marked as stale to about 3 years
and 5 months.
 2017-06-02 09:53:50 -06:00
Mike Place
3190b88df0 Merge pull request #41559 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-02 10:28:29 -05:00
Mike Place
0386ce968d Merge pull request #41558 from rallytime/salt-cloud-py3 
Various Python 3 fixes for salt-cloud
 2017-06-02 10:28:10 -05:00
rallytime
c617dc0248 Remove duplicate tearDown test functions in tcp unit test 2017-06-02 09:05:29 -06:00
Ric Klaren
b08ddbb6d9 Merge branch 'develop' into salt-cloud-libvirt-tweaks 2017-06-02 14:57:15 +02:00
Erik Johnson
26d5a999e5 Merge branch 'develop' into clean_job_cache 2017-06-02 00:50:48 -05:00
rallytime
cf988e7ad4 Pylint fix 2017-06-01 17:46:44 -06:00
Nicole Thomas
8718033171 Merge pull request #41532 from wasabi222/patch-3 
change default skip_verify to False
 2017-06-01 17:40:58 -06:00
Nicole Thomas
361fbe629b Merge pull request #41533 from svinota/develop 
unit tests: add pyroute2 interface dict test
 2017-06-01 17:29:07 -06:00
Nicole Thomas
3d9e0e6ad2 Merge pull request #41551 from darenjacobs/patch-1 
Update __init__.py
 2017-06-01 17:20:39 -06:00
rallytime
80896a785a Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-01 17:15:47 -06:00
rallytime
833b2145c4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-06-01 17:15:36 -06:00
Nicole Thomas
ae2ce3f818 Merge pull request #41515 from twangboy/fix_win_file 
Fix makedirs_ function
 2017-06-01 17:10:39 -06:00
Nicole Thomas
0de597bf5a Merge pull request #41548 from tsaridas/config_get 
get config from __salt__
 2017-06-01 17:09:20 -06:00
rallytime
0c19cab2a1 Fix hexdigest call to use salt's PY3 compatible hash util in gogrid driver 2017-06-01 16:43:50 -06:00
rallytime
d9d07a817d Fix some more places where .keys() is being used improperly for PY3 
The .keys() function itself is fine, it's just what we do after calling
it that matters. Anywhere we try to index the dictionary view will
stacktrace in PY3.
 2017-06-01 16:33:41 -06:00
Nicole Thomas
a49348cc89 Merge pull request #41535 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-06-01 16:25:35 -06:00
Ric Klaren
aa88749a71 Add flag to disable validation when cloning a libvirt domain 
Provide workaround for issue #41137
 2017-06-01 23:14:15 +02:00
Ric Klaren
dc860c46e5 Fix logging of clone XML 2017-06-01 23:13:53 +02:00
rallytime
655e5fa1d3 Pass in a list as final arg to cloud.filter_event utils call 
The third argument that is passed to the salt.utils.cloud.filter_event
function is supposed to be a list. Most of the places calling this function
were using `foo.keys()`, which returns a list in PY2. But, in PY3, this
is a dictionary view.

This change updates the places where `filter_event` is using `.keys()` and
instead wraps the dict with list(). It also adds some extra type checking
in the filter_event function in case a list is not passed in.
 2017-06-01 12:50:42 -06:00
Mike Place
39840bfe4e Merge pull request #41436 from skizunov/develop2 
TCP transport: Fix occasional errors when using salt command
 2017-06-01 11:37:42 -05:00
rallytime
cb69296f55 Remove test_win_firewall unit tests: they don't actually test anything 2017-06-01 10:07:23 -06:00
Nicole Thomas
1625fa0d2d Merge pull request #41536 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-06-01 09:46:12 -06:00
Nicole Thomas
5295ff2a50 Merge pull request #41526 from DSRCorporation/bugs/py3_tests_nitrogen 
Py3 related tests and code fixes
 2017-06-01 09:16:43 -06:00
Mike Place
5eec523ef8 Merge pull request #41528 from wasabi222/patch-1 
default skip_verify to False
 2017-06-01 09:57:58 -05:00
Mike Place
77420c5c57 Merge pull request #41541 from twangboy/fix_salt-proxy 
Fix salt-proxy on Py2
 2017-06-01 09:54:42 -05:00
darenjacobs
84b678ddb3 Update __init__.py 
Fix for #35481
 2017-06-01 10:33:37 -04:00
Andreas Tsaridas
3efab5f8cc Merge branch 'develop' into clean_job_cache 2017-06-01 16:15:11 +02:00
Andreas Tsaridas
e8dc3f4fba Merge branch 'develop' into config_get 2017-06-01 16:14:17 +02:00
Dmitry Kuzmenko
7ba25db473 Replace assertCountEqual not-implemented in Py2 2017-06-01 16:52:09 +03:00
Dmitry Kuzmenko
64954d8e40 Fixed pylint errors. 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2ae68ee591 Added cache test. 
Implemented some time ago, but forgotten.
 2017-06-01 16:49:57 +03:00