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
91,354 Commits 24 Branches 182 Tags 341 MiB
cd018c05d4
Commit Graph

91354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
cd018c05d4
Fixing typo in test_jobs. Fixing lint. 2018-03-01 07:56:55 -08:00
Gareth J. Greenaway
6534f18be6
Adding tests. 2018-02-28 07:32:07 -08:00
Gareth J. Greenaway
0e177e713d
Catch TypeError when not all required arguments are passed to a runner. Display error and usage. 2018-02-27 14:29:32 -08:00
Nicole Thomas
7f326c0c17
Merge pull request #46204 from rallytime/merge-develop 
[develop] Merge forward from 2018.3 to develop
 2018-02-27 10:22:52 -05:00
Nicole Thomas
adf219e4b7
Merge pull request #46200 from DSRCorporation/bugs/postgres_unit_test_fix 
[develop] Postgress module unit test fix.
 2018-02-27 10:19:08 -05:00
rallytime
379e33cb3c
Lint fix: remove unused import 2018-02-27 10:14:35 -05:00
Nicole Thomas
cab1d9c1d5
Merge pull request #46191 from DSRCorporation/bugs/sj831_log_callback_fix 
Format string before passing to log_callback.
 2018-02-26 16:21:18 -05:00
Nicole Thomas
dcf472b378
Merge pull request #46194 from DSRCorporation/bugs/sj829_clustershell_test_fix 
Fixed bad clustershell merge.
 2018-02-26 16:20:20 -05:00
rallytime
6927642321
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/modules/cmdmod.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
 2018-02-26 14:23:06 -05:00
Dmitry Kuzmenko
21673ea4eb
Postgress module unit test fix. 2018-02-26 21:50:13 +03:00
Nicole Thomas
6c67741544
Merge pull request #45855 from sjorge/zfsutils 
zfs/zpool refactor
 2018-02-26 11:50:33 -05:00
Megan Wilhite
78671738ff
Merge pull request #46134 from rallytime/develop_update_version_doc 
Update release versions for the develop branch
 2018-02-26 11:42:32 -05:00
Nicole Thomas
06d2dff3ac
Merge pull request #46168 from gtmanfred/2018.3 
driver and provider should be specified
 2018-02-26 11:17:12 -05:00
Nicole Thomas
605e5eff73
Merge pull request #46161 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-26 10:29:38 -05:00
Nicole Thomas
f9408cec52
Merge pull request #46102 from mephi42/develop 
Allow configuring HTTP connect timeout
 2018-02-26 10:15:06 -05:00
Nicole Thomas
87ba05c6a2
Merge pull request #45993 from sdodsley/purefb_module 
Add module for Pure Storage FlashBlade array
 2018-02-26 10:13:57 -05:00
Dmitry Kuzmenko
b15ad95681
Fixed bad clustershell merge. 2018-02-26 17:05:44 +03:00
Dmitry Kuzmenko
0fa4faafef
Format string before passing to log_callback. 2018-02-26 16:10:39 +03:00
Jorge Schrauwen
8c7b3e530c Phase 3 - Minor cleanup based on feedback 2018-02-25 11:41:04 +01:00
Simon Dodsley
b0403be0fa Add module for Pure Storage FlashBlade array 2018-02-24 09:03:38 -05:00
Jorge Schrauwen
dd29778ed5 Phase 3 - Cleanup tests 2018-02-24 13:37:43 +01:00
Jorge Schrauwen
01da93ec1f Phase 3 - Minor cleanups 2018-02-24 13:37:43 +01:00
Jorge Schrauwen
ba45fcca31 Phase 2 - salt.states.zfs 2018-02-24 13:37:43 +01:00
Jorge Schrauwen
8517e876e4 Phase 2 - salt.states.zfs tests 2018-02-24 13:37:43 +01:00
sjorge@acheron.be
ce5c9792ea Phase 2 - salt.states.zpool 
They old way of passing the zpool layout was a pain to work with.
A new layout has been introduce and the documentation updated accordingly.

The legacy format is still supported.
 2018-02-24 13:37:43 +01:00
sjorge@acheron.be
f4bcf5fa71 Phase 2 - salt.states.zpool tests 2018-02-24 13:37:43 +01:00
Super-User
9d18da9e2e Phase 1 - salt.modules.zpool 2018-02-24 13:37:42 +01:00
Super-User
fce3920b07 Phase 1 - salt.modules.zpool tests 2018-02-24 13:37:42 +01:00
Super-User
5ca342494f Phase 1 - salt.modules.zfs 2018-02-24 13:37:42 +01:00
Super-User
e7e902662b Phase 1 - salt.modules.zfs tests 2018-02-24 13:37:42 +01:00
Super-User
a64d81d2cd Phase 1 - salt.grains.zfs 2018-02-24 13:37:42 +01:00
Super-User
505b816914 Phase 0 - salt.utils.zfs 2018-02-24 13:37:42 +01:00
Super-User
7b32faa0ce Phase 0 - salt.utils.zfs tests 2018-02-24 13:37:42 +01:00
mephi42
46996178e2
Allow configuring HTTP connect timeout 2018-02-24 13:21:26 +01:00
rallytime
69ac94baca
Update utils paths 2018-02-24 06:55:09 -05:00
rallytime
cffbf52c10
Lint fix: remove extra line 2018-02-24 06:51:25 -05:00
Nicole Thomas
8aaac011b4
Merge pull request #45905 from jasperla/pf 
add execution module for OpenBSD Packet Filter
 2018-02-23 14:28:17 -05:00
Nicole Thomas
90353c90f8
Merge pull request #45820 from iustinam/reusetok 
Make vault session token reusable
 2018-02-23 14:26:29 -05:00
Nicole Thomas
606d70c521
Merge pull request #45945 from xyoun/develop 
pip.list_all_versions now can read index_url
 2018-02-23 14:23:48 -05:00
Nicole Thomas
ebd3b0d88c
Merge pull request #46003 from rrzaripov/update_win_network_ip_addrs 
Updating functions win_network.ip_addrs
 2018-02-23 14:22:54 -05:00
Nicole Thomas
803138f5e5
Merge pull request #46130 from areaxx/develop 
[#46028] strictly separate extension with and without classifier
 2018-02-23 14:11:31 -05:00
Nicole Thomas
05b771bfd7
Merge pull request #46160 from rallytime/flaky-tests 
Mark 2 tests as flaky
 2018-02-23 14:10:05 -05:00
Gareth J. Greenaway
36facd3f18
Merge pull request #46169 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 10
 2018-02-23 11:09:32 -08:00
rallytime
b97eafc85e
Reduce the number of days an issue is stale by 10 2018-02-23 14:06:25 -05:00
Daniel Wallace
ac99bd26db
driver and provider should be specified 
This is not needed in Oxygen
 2018-02-23 11:55:43 -07:00
rallytime
79bed6cff1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/reg.py
  - salt/modules/win_lgpo.py
  - salt/modules/win_path.py
  - salt/modules/win_pkg.py
  - salt/pillar/file_tree.py
  - salt/states/boto3_route53.py
  - salt/states/reg.py
  - salt/utils/win_functions.py
  - tests/unit/modules/test_kubernetes.py
  - tests/unit/modules/test_win_path.py
 2018-02-23 09:50:19 -05:00
rallytime
49e49ae51b
Mark 2 tests as flaky 
- integration.spm.test_man_spm.SPMManTest.test_man_spm
- integration.ssh.test_state.SSHStateTest.test_state_running
 2018-02-23 09:34:14 -05:00
Jasper Lievisse Adriaanse
a973b70d64
add execution module for OpenBSD Packet Filter 2018-02-22 21:08:35 +01:00
Nicole Thomas
9b2bc1982c
Merge pull request #46006 from dincamihai/oxygen.rc1 
Remove obsolete unicode handling in pkg.info_installed
 2018-02-22 14:22:35 -05:00
Nicole Thomas
0398ce0482
Merge pull request #46135 from rallytime/bp-46088 
Back-port #46088 to 2017.7
 2018-02-22 10:11:13 -05:00