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
91,373 Commits 24 Branches 182 Tags 341 MiB
701c7f90b4
Commit Graph

91373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
701c7f90b4
Include PR https://github.com/saltstack/salt/pull/46267 2018-03-01 16:02:22 -08:00
Gareth J. Greenaway
4f24c546e3
Include https://github.com/saltstack/salt/pull/46190 2018-03-01 16:02:22 -08:00
Gareth J. Greenaway
cde50c6dab
Fixing lint 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
2aa9a84b28
Adding changes from #45323 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
65561441e5
Add changes from PR #46143 to develop 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
e23da417d5
Fixing a couple typos. Converting the code to handle after & until to sub functions. 2018-03-01 16:02:21 -08:00
Gareth J. Greenaway
dcc5deaea5
Porting #46084 to Develop 2018-03-01 16:02:21 -08:00
Nicole Thomas
7731ffae20
Merge pull request #46289 from rallytime/update-release-notes 
Port 2018.3.0.rst release note changes to develop
 2018-03-01 17:12:08 -05:00
Nicole Thomas
4df31ac297
Merge pull request #46248 from garethgreenaway/45325_display_usage_for_runners 
[develop] display usage for runners when missing arguments
 2018-03-01 14:44:18 -05:00
rallytime
18eca3da3b
Port 2018.3.0.rst release note changes to develop 2018-03-01 14:24:10 -05:00
Gareth J. Greenaway
cd018c05d4
Fixing typo in test_jobs. Fixing lint. 2018-03-01 07:56:55 -08:00
Nicole Thomas
806ab23775
Merge pull request #46218 from The-Loeki/docker-events-filter 
engine.docker_events: Add filter
 2018-02-28 14:09:13 -05:00
Nicole Thomas
1953532b2a
Merge pull request #46111 from alexvasiu/develop 
modules/nilrt_ip.py: Change get_interfaces_details
 2018-02-28 13:53:15 -05:00
Nicole Thomas
a0869fe533
Merge branch 'develop' into develop 2018-02-28 10:38:55 -05:00
Gareth J. Greenaway
6534f18be6
Adding tests. 2018-02-28 07:32:07 -08:00
Ronald van Zantvoort
60a668f44b
Update docker_events.py 2018-02-28 00:10:17 +01: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
Ronald van Zantvoort
7ba79eaadc
engine.docker_events: Add filter 2018-02-27 20:10:22 +01:00
Alexandru Vasiu
78471f8095 modules/nilrt_ip.py: Add default value for gateway 
In case that connman cannot provide a default gateway, then this should
have a default value (0.0.0.0) to keep consistency between various ip
modules.

Signed-off-by: Alexandru Vasiu <alexandru.vasiu@ni.com>
 2018-02-27 17:35:24 +02: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
Vasiu Alexandru
89d4915d8d
Merge branch 'develop' into develop 2018-02-26 00:14:45 +02: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