valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,168 Commits 24 Branches 182 Tags 341 MiB
714d057295
Commit Graph

11417 Commits

Author SHA1 Message Date
Nicole Thomas
714d057295
Merge branch 'develop' into move-44053 2017-12-04 12:53:59 -05:00
twangboy
371e210247
Add ability to reset file system object perms 2017-12-01 16:51:18 -07:00
Thomas S Hatch
887336c6de
Merge pull request #44691 from isbm/isbm-ansiblegate-issue44670 
Bugfix: ansiblegate, issue 44670
 2017-12-01 16:11:52 -07:00
Nicole Thomas
5b3da7dbb3
Merge pull request #44762 from cloudflare/sync-thorium 
Add saltutil.sync_thorium execution and runner functions
 2017-12-01 09:21:19 -05:00
Bo Maryniuk
e1eec2c69d Add unit test for __virtual__ in case Ansible is installed on the Minion 2017-12-01 11:21:27 +01:00
Bo Maryniuk
fa21af69dd Add unit test for __virtual__ in case Ansible is not installed on the Minion 2017-12-01 11:21:27 +01:00
Nicole Thomas
5c737100c4
Merge pull request #44726 from terminalmage/issue42188 
Add __context__ to RunnerClient and WheelClient
 2017-11-30 19:03:02 -05:00
rallytime
dc3097cedd
Write a unittest for error message raised with missing "." in function 2017-11-30 11:05:22 -05:00
Mircea Ulinic
dce017b3f7
Make tests happy 2017-11-30 15:50:11 +00:00
Erik Johnson
74a18f387f
Update orchestration unit tests 2017-11-29 15:51:53 -06:00
Nicole Thomas
1855f3fe12
Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments 
[develop] Fix to grains/core.py
 2017-11-29 09:05:59 -05:00
Erik Johnson
18905cf32b
Add integration test for triggering orchestration failure via context 2017-11-28 22:03:11 -06:00
Gareth J. Greenaway
89b546c075
Merge branch 'develop' into netbox-module 2017-11-28 15:25:42 -08:00
Gareth J. Greenaway
6ee18e4f38
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-28 13:35:11 -08:00
Nicole Thomas
669f037761
Merge pull request #44703 from terminalmage/fix-ssh-test 
Fix ssh state.show_top integration test (develop branch)
 2017-11-28 12:41:34 -05:00
Nicole Thomas
a5828d6ad9
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-28 09:17:34 -05:00
Erik Johnson
682fc1b884
Fix failing grains test on CentOS 
Resolves https://github.com/saltstack/salt-jenkins/issues/556
 2017-11-27 21:37:46 -06:00
Zach Moody
1faa685d9e fixup pylint import error. 2017-11-27 19:05:51 -06:00
Zach Moody
871a90cbc5 add netbox execution module 2017-11-27 18:59:06 -06:00
Erik Johnson
1f893d1e95
Fix ssh state.show_top integration test 
63823f3 changed how we handle cases where master_tops and top file
matches both exist in a given environment. This updates the test to
reflect the correct behavior in develop based on the fact that the
master_tops_first config option is set to False.

See: https://github.com/saltstack/salt/pull/44697#issuecomment-347373412
and the subsequent comments in that pull request.
 2017-11-27 18:50:10 -06:00
Nicole Thomas
7adc0b5b6f
Merge pull request #43893 from olivier-mauras/saltclass 
SaltClass: Correct when dict is NoneType because of the value doesn't exist
 2017-11-27 16:24:25 -05:00
Nicole Thomas
94001ffc64
lint: whitespace fixes 2017-11-27 16:15:44 -05:00
Nicole Thomas
e8298d734d
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-27 15:08:36 -05:00
Nicole Thomas
cae5309752
Merge pull request #44646 from mchugh19/pip-is_installed 
add is_installed function
 2017-11-27 14:40:55 -05:00
Erik Johnson
8ee5e57fee
Merge pull request #44649 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-11-27 11:23:29 -06:00
Nicole Thomas
9e45e4eff9
Lint: Remove extra blank lines 2017-11-27 11:25:05 -05:00
Jorge Schrauwen
a94edecc93
Merge branch 'develop' into zpoolupdate 2017-11-23 16:53:41 +01:00
Christian McHugh
ab5520fdf7 add true and false test for is_installed 2017-11-23 14:08:46 +00:00
rallytime
1dea504f2d
Replace util path references with new ones 2017-11-22 12:44:36 -05:00
rallytime
052b13c98e
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/modules/win_pkg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/proxy/fx2.py
  - salt/utils/__init__.py
  - salt/utils/jinja.py
  - salt/utils/napalm.py
  - salt/utils/path.py
  - salt/utils/verify.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_service.py
  - tests/unit/utils/test_verify.py
 2017-11-22 12:36:03 -05:00
Nicole Thomas
d6ccf4bb30
Merge pull request #44616 from Ch3LL/nonbase_test 
Add Non Base Environement salt:// source integration test
 2017-11-22 11:13:53 -05:00
Nicole Thomas
071a1bd65b
Merge branch '2017.7' into thindir_ssh 2017-11-21 22:23:09 -05:00
Nicole Thomas
80b71652e3
Merge branch '2017.7' into nonbase_test 2017-11-21 22:23:00 -05:00
Ch3LL
359a59dd64
Add salt-key -d integration test 2017-11-21 10:40:25 -05:00
Ch3LL
74ededafa7
Add ssh thin_dir integration test 2017-11-20 17:37:38 -05:00
Ch3LL
c9ba33432e
Add Non Base Environement salt:// source integration test 2017-11-20 16:53:56 -05:00
Gareth J. Greenaway
227be73e0a
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments 2017-11-20 11:01:38 -08:00
Mike Place
446e3436c2
Merge pull request #44573 from garethgreenaway/requisite_without_module_name 
Adding the ability to specify requisites without a state module name
 2017-11-20 18:50:13 +00:00
Nicole Thomas
2eca2fe219
Merge branch 'develop' into requisite_without_module_name 2017-11-20 09:22:48 -05:00
Roald Nefs
ac1a4d0817
Updated Telegram returner test 
- Removed trailing newlines
 2017-11-20 10:41:08 +01:00
Roald Nefs
47147e2769
Added new Telegram module 
Added a new Telegram module, which allows to send a message via Telegram
using the Telegram Bot API. The commit also includes:
- Update for the Telegram returner (merged in #44148); the Telegram
returner now fully utilizes the Telegram module.
- Update to the documentation in order to add the Telegram module to the
list list of all modules.
- Updated Telegram returner test.
- New Telegram module test.
 2017-11-20 08:47:57 +01:00
Jorge Schrauwen
409acc1b1b Also add tests for zpool.scrub 2017-11-19 12:16:29 +01:00
Jorge Schrauwen
64e0b45e51 Add tests for zpool.labelclear and zpool.split 2017-11-19 12:09:36 +01:00
Anita Krueger
d3c4f6026b
Adding nexus state and module including unit tests 2017-11-18 15:31:37 +00:00
Nicole Thomas
7f2dd0382c
Merge pull request #44537 from Ch3LL/ssh_highlow 
Add multiple salt-ssh state integration tests
 2017-11-17 12:17:47 -05:00
Gareth J. Greenaway
3d2f305053
Fixing expected test results. 2017-11-16 16:02:56 -08:00
Nicole Thomas
c2c3048f46
Merge pull request #44575 from Ch3LL/ser_run_test 
Add service.running integration state test
 2017-11-16 17:27:56 -05:00
Gareth J. Greenaway
dea335e3d0
Adding state files used by new integration tests. 2017-11-16 13:26:53 -08:00
Nicole Thomas
24b1d7af31
Merge pull request #44518 from twangboy/win_fix_verify_env 
Pass root_dir to the win_verify_env function
 2017-11-16 15:57:48 -05:00
Ch3LL
7536150567
Add service.running integration state test 2017-11-16 14:12:59 -05:00