valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,584 Commits 24 Branches 182 Tags 341 MiB
de956977cd
Commit Graph

82584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Schaller
de956977cd only list top level npm modules during {un)install 2017-06-04 22:44:54 -07: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
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
Mike Place
73365c38a8 Merge branch 'develop' into develop 2017-06-02 12:03:56 -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
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
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
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
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
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
Dmitry Kuzmenko
4a2406f178 Py3: fixed some tests. 
tls module: convert bytes to string
gzip util: use BytesIO for 'wb' file
django module: ignore arguments order in assert
pillar module: correctly test pillar merge
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
fef0e0ea67 Catch errors on socket.shutdown. 
It throws an exception if the socket wasn't connected.
 2017-06-01 16:49:57 +03:00
Dmitry Kuzmenko
2b3276077c Py3: Fixed schema serialization. Enabled tests back. 2017-06-01 16:49:49 +03:00
Andreas Tsaridas
a75370eaa4 remove syspath import + one more occurrence 2017-06-01 15:35:54 +02:00
Andreas Tsaridas
6f0a036aa3 get config from __salt__ 2017-06-01 15:07:30 +02:00
Peter V. Saveliev
602a7af748 unit tests: test_pyroute2 -- add skipIf 
... and comments

Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-01 10:47:26 +02:00
rongzeng
bd0f3a4359 fixed salt-minion initd file bug 
if salt-minion has its grains, for using "salt-call --local config.get PARAM" get the right PARAM, should add "--skip-grains", or the script cant work normal.
 2017-06-01 14:37:01 +08:00
Peter V. Saveliev
d4939e1ac9 unit tests: add encoding clause into test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-06-01 07:44:47 +02:00
twangboy
5743394668 Use six.string_type instead of str 
Use six.string_type instead of string_type
Use six.text_type instead of text_type
Remove from salt.ext.six import string_types, text_type
 2017-05-31 19:18:40 -06:00
rallytime
e848c67682 Merge branch 'nitrogen' into 'develop' 
Conflicts:
  - salt/states/keystone.py
 2017-05-31 14:39:33 -06:00
Peter V. Saveliev
c744cbefd7 unit tests: fix absolute imports in test_pyroute2 
Bug-Url: https://github.com/saltstack/salt/pull/41533
 2017-05-31 22:34:00 +02:00
rallytime
63ea033ec3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_status.py
  - salt/states/selinux.py
  - tests/unit/modules/test_ssh.py
 2017-05-31 14:29:12 -06:00
Mike Place
06ed4f077b Merge pull request #41337 from Foxlik/2016.11 
Fix #41335 - list index out of range on empty line in authorized_keys
 2017-05-31 14:59:16 -05:00
Mike Place
1ace72d871 Merge pull request #41512 from twangboy/fix_win_status 
Use psutil where possible in win_status.py
 2017-05-31 14:55:59 -05:00
Mike Place
232a25707e Merge pull request #41494 from cloudflare/bgp-runner-enhancement 
Enhance BGP runner
 2017-05-31 14:54:31 -05:00
Mike Place
683cc5f414 Merge pull request #41490 from jdsieci/2016.11_selinux 
Backport of SELinux module installation and removal
 2017-05-31 14:37:59 -05:00
Peter V. Saveliev
e51e5c7e2f unit tests: add pyroute2 interface dict test 
Bug-Url: https://github.com/saltstack/salt/pull/41487
Bug-Url: https://github.com/saltstack/salt/issues/41461
 2017-05-31 20:57:44 +02:00
Mike Place
241bc839fb Merge pull request #41472 from plastikos/bug-denied_key_exit_status 
When the minion key is denied by the master then exit status 77 (permission denied)
 2017-05-31 12:38:40 -05:00
Mike Place
b43044fbf1 Merge pull request #41487 from svinota/develop 
clean up `change` attribute from interface dict
 2017-05-31 12:38:00 -05:00
Mike Place
e1ac59bc0b Merge branch 'develop' into develop 2017-05-31 12:37:34 -05:00