valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,117 Commits 24 Branches 182 Tags 341 MiB
3a9746f67e
Commit Graph

6133 Commits

Author SHA1 Message Date
Anil Kabra
3a9746f67e Merge branch 'develop' into v2016.11.5_protect_master_key 2017-07-27 17:04:51 -05:00
Mike Place
71b4c86a40 Merge pull request #42430 from alexbleotu/esxdatacenter_proxy-gh 
Esxdatacenter proxy + related updates
 2017-07-27 13:47:10 -05:00
Anil Kabra
acfc5fb710 Resolved merge conflict 2017-07-27 13:28:41 -05:00
Sigmon, Jeffrey
bb29afd022 Passphrase protect master private key 2017-07-27 13:17:26 -05:00
rallytime
1f0b90aa57 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/engines/slack.py
 2017-07-26 17:51:36 -06:00
Alexandru Bleotu
c565ed94dd Merge branch 'develop' into esxdatacenter_proxy-gh 2017-07-25 23:36:25 +01:00
Mike Place
fa519b76d0 Merge pull request #42310 from moio/zypper-list_pkg-attr-parameter 
zypper.list_pkgs: add parameter for returned attribute selection
 2017-07-25 16:07:45 -05:00
Mike Place
62abac6fbc Merge pull request #42396 from rallytime/parse_docstring_util 
Move parse_docstring from salt.utils to salt.utils.doc.py
 2017-07-25 16:04:00 -05:00
Mike Place
07c2793e86 Merge pull request #42266 from twangboy/win_unit_states_test_file 
Fix `unit.states.test_file` for Windows
 2017-07-25 15:26:32 -05:00
Nicole Thomas
c793d83d26 Merge pull request #42180 from twangboy/win_unit_test_timezone 
Fix `unit.modules.test_timezone` for Windows
 2017-07-24 08:46:16 -06:00
garethgreenaway
580c6989b3 Merge branch 'develop' into esxdatacenter_proxy-gh 2017-07-21 10:45:53 -07:00
Alexandru Bleotu
500899bc12 Fix tests #2 2017-07-21 08:18:57 +01:00
Alexandru Bleotu
0ba680f68e Merge branch 'develop' into datacenter_vsphere_func-gh 2017-07-21 07:58:56 +01:00
Silvio Moioli
5e23f5d678 zypper.list_pkgs: add install_time_date_t as a supported attribute 2017-07-21 08:15:50 +02:00
Silvio Moioli
db22777a09 zypper_test: add test for list_pkgs and attr 2017-07-21 08:14:37 +02:00
Silvio Moioli
bb049cb70f zypper_test: adapt existing unit tests to new code 2017-07-21 08:14:37 +02:00
Silvio Moioli
a32ee4af05 zypper_test: correct mock behavior 
Previously incorrect, although the test passed
 2017-07-21 08:14:37 +02:00
Alexandru Bleotu
7f52358eac Fixed test 2017-07-21 00:07:42 +01:00
Alexandru Bleotu
632cbf69b4 Fixed pylint 2017-07-20 22:22:24 +01:00
Alexandru Bleotu
d5b6c6be25 Fixed pylint 2017-07-20 21:06:35 +01:00
Alexandru Bleotu
5a63ed7449 Added tests for datacenter_configured state 2017-07-20 16:43:44 +01:00
Erik Johnson
2fb986f5ca Merge pull request #42367 from rallytime/files-util 
Move file-related utilities out of init file and into salt.utils.files.py
 2017-07-19 16:55:52 -05:00
rallytime
60d80fc06c Move parse_docstring from salt.utils to salt.utils.doc.py 
- Moves function to new location in salt.utils.doc.py
- Adds deprecation warning to salt.utils.parse_docstring
- Moves related unit test in test_utils.py to new test_doc.py file
 2017-07-19 12:06:55 -06:00
Mike Place
c9972fe4fb Merge pull request #42383 from AndrewPashkin/revert-37003-gradual-pillar-loading 
Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file"
 2017-07-19 11:28:22 -05:00
Alexandru Bleotu
89f4f324e6 Added tests for salt.modules.vsphere.create_datacenter 2017-07-19 17:20:24 +01:00
Alexandru Bleotu
b0aafe1632 Added tests for salt.modules.vsphere.list_datacenters_via_proxy 2017-07-19 17:20:23 +01:00
Nicole Thomas
59e012b485 Merge pull request #42150 from twangboy/win_unit_test_pip 
Fix `unit.modules.test_pip` for Windows
 2017-07-19 10:01:17 -06:00
Nicole Thomas
ade25c6b34 Merge pull request #42154 from twangboy/win_unit_test_reg 
Fix `unit.modules.test_reg_win` for Windows
 2017-07-19 10:00:38 -06:00
Mike Place
7419e82cb2 Merge pull request #42362 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-07-19 10:56:15 -05:00
Nicole Thomas
07593675e2 Merge pull request #42182 from twangboy/win_unit_test_useradd 
Fix `unit.modules.test_useradd` for Windows
 2017-07-19 09:55:32 -06:00
Alexandru Bleotu
f343a2b277 Added tests for esxdatacenter proxy 2017-07-19 15:24:10 +01:00
Alexandru Bleotu
e041b8f486 Added tests for get_details in modules.esxdatacenter 2017-07-19 15:24:10 +01:00
Alexandru Bleotu
6814e8405d Added tests for supporting esxdatacenter proxy in modules.vsphere 2017-07-19 15:24:10 +01:00
Andrew Pashkin
b0148c15c7 Revert "Make possible to reference previous pillars from subsequent pillars, as they specified in the top file" 2017-07-19 12:25:22 +03:00
rallytime
0ab4787d81 Fix all salt.utils fopen references in test_file 2017-07-18 17:10:11 -06:00
rallytime
3f0945b9b7 Fix one more salt.utils fopen reference to point to files 2017-07-18 15:04:49 -06:00
rallytime
89d957b124 Update unit test mocks for salt.utils.files.fopen 2017-07-18 13:40:07 -06:00
rallytime
0f5dd79aa0 Lint fixes 2017-07-18 12:46:15 -06:00
rallytime
df693423b9 Move salt.utils.rm_rf to salt.utils.files.rm_rf 
Also added a deprecation warning to utils/__init__.py and updated
all references to rm_rf in salt codebase.
 2017-07-18 10:48:54 -06:00
rallytime
ccf790a83f Update all references for moved functions to use "files" util 
- fopen
- flopen
- fpopen
- safe_rm
- is_empty
- is_fcntl_available
 2017-07-18 10:31:01 -06:00
rallytime
f59ecb7ffe Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/executors/sudo.py
 2017-07-18 08:57:55 -06:00
Mike Place
3ec5bb1c2f Merge pull request #42257 from twangboy/win_unit_pillar_test_git 
Fix `unit.pillar.test_git` for Windows
 2017-07-17 12:51:41 -05:00
Mike Place
36395625c2 Merge pull request #42258 from twangboy/win_unit_states_tests_environ 
Fix `unit.states.test_environ` for Windows
 2017-07-17 12:50:37 -05:00
Mike Place
894bdd2b19 Merge pull request #42265 from rallytime/gate-moto-version 
Gate boto_elb tests if proper version of moto isn't installed
 2017-07-17 12:47:51 -05:00
Mike Place
baf04f2a2d Merge pull request #42277 from twangboy/win_unit_states_test_winrepo 
Fix `unit.states.test_winrepo` for Windows
 2017-07-17 12:37:06 -05:00
Mike Place
acd29f9b38 Merge pull request #42206 from rallytime/fix-flaky-test 
[PY3] Fix test that is flaky in Python 3
 2017-07-17 12:09:52 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
twangboy
ed89cd0b93 Use os.sep for path seps 2017-07-12 10:13:26 -06:00
Andrew Pashkin
7d59f7a6c6 Make possible to reference pillars, that come before current pillar in the top file 2017-07-12 19:03:05 +03:00
twangboy
669aaee10d Mock file exists properly 2017-07-11 17:09:21 -06:00