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,289 Commits 24 Branches 182 Tags 341 MiB
c67afbeb36
Commit Graph

91289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
c67afbeb36
Merge pull request #46650 from Ch3LL/nacl_test 
Mirror libnacl imports in test from the nacl module
 2018-03-26 10:48:39 -04:00
Nicole Thomas
03b58a01cf
Merge pull request #46645 from terminalmage/release-notes 
Add Unicode / Python 3 update to 2018.3.0 release notes
 2018-03-26 10:43:53 -04:00
Nicole Thomas
308c9ddfc3
Merge pull request #46661 from Kimol/2018.3-fix_chocolatey_check_remote_packages 
Chocolatey - Lowered name of local and remote packages before comparing versions.
 2018-03-26 10:35:38 -04:00
Karol Dąbkowski
52581e7918
Removed trailing whitespace 2018-03-23 09:28:07 +01:00
Karol Dabkowski
123a86947c Chocolatey - Added lowering local packages for unifing both local and remote names to lowercase for comparison. 2018-03-22 19:37:37 +01:00
Erik Johnson
986c7bcdae
Rewrite unicode/py3 section 2018-03-22 09:39:06 -05:00
Karol Dabkowski
4be1a991c2 Lowered name of available packages before comparing with local packages 2018-03-22 12:13:19 +01:00
Mike Place
2e1f7c37f7
Merge pull request #46569 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-03-21 20:57:04 +00:00
Ch3LL
9fef8bc431
Mirror libnacl imports in test from the nacl runner 2018-03-21 15:18:58 -04:00
Ch3LL
f11d58a8e9
Mirror libnacl imports in test from the nacl module 2018-03-21 15:10:46 -04:00
Erik Johnson
064bc83276
Add Unicode / Python 3 update to 2018.3.0 release notes 2018-03-21 12:40:10 -05:00
Nicole Thomas
8cdd56b9dc
Merge pull request #46620 from rallytime/merge-2018.3.0rc1-into-2018.3 
[2018.3] Merge 2018.3.0rc1 into 2018.3
 2018-03-20 18:45:00 -04:00
rallytime
46ba72fb1c
Fix pillar unit test failures: file_roots and pillar_roots environments should be lists 2018-03-20 17:32:21 -04:00
rallytime
b03cda3cea
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-20 09:13:13 -04:00
Nicole Thomas
e1ade5dbb2
Merge pull request #46597 from terminalmage/fix-divergent-mongodb-states 
Revert PR 41278
 2018-03-19 22:02:37 -04:00
Nicole Thomas
b361bc93e8
Merge pull request #46608 from garethgreenaway/46593_schedule_present_always_triggers_change 
[2018.3.0rc1] fixes to scheduler
 2018-03-19 22:01:50 -04:00
Nicole Thomas
2d2fe22ae2
Merge pull request #46606 from Ch3LL/infoblox_docs 
add autodoc topics for infoblox state modules
 2018-03-19 17:35:46 -04:00
Nicole Thomas
36a64ab2d8
Lint: Remove extra blank line 2018-03-19 17:03:25 -04:00
Erik Johnson
db304c3eff
Update tests to reflect changes to state returns 2018-03-19 15:18:49 -05:00
Erik Johnson
c4712135a6
Revert PR 41278 
This PR should not have been merged, as there are very good reasons for
keeping the mongodb_database and mongodb_user state modules separate.
Additionally, role management was already supported at the time the PR
was merged.

Since this PR has not been in an official release of Salt, I'm reverting
it now to prevent any confusion.
 2018-03-19 15:18:49 -05:00
Nicole Thomas
1b7272ff55
Merge pull request #46530 from twangboy/optional_grains 
Make iSCSI and Fibre Channel grains optional
 2018-03-19 14:02:14 -04:00
Gareth J. Greenaway
da9a9b6e37
Fixing a bug that would result in constant changes using the schedule state module when a job was added with run_on_start. Adding an eval test to test run_on_start functionality. 2018-03-19 09:23:22 -07:00
Ch3LL
6eab6a7dc4
add autodoc topics for infoblox state modules 2018-03-19 11:06:37 -04:00
Nicole Thomas
74d12cf4d6
Merge branch '2018.3.0rc1' into optional_grains 2018-03-19 10:03:37 -04:00
Nicole Thomas
20ed81f009
Fix typo 2018-03-19 08:00:15 -04:00
Nicole Thomas
93ab582230
Small grammar fix to new grains settings 2018-03-19 07:59:41 -04:00
Nicole Thomas
d2516b251f
Merge pull request #46589 from Ch3LL/mac_user 
Preserve tuples when decoding grain data in loader
 2018-03-19 07:44:08 -04:00
Nicole Thomas
e7dc802e2c
Merge branch '2018.3.0rc1' into optional_grains 2018-03-19 07:39:02 -04:00
Ch3LL
771e21e28b
Preserve tuples when decoding grain data in loader 2018-03-16 18:58:45 -04:00
twangboy
352eae3ffe
Add configuration options to docs and release notes 
Remove __proxyenabled__ from the two new grains files.
 2018-03-16 13:27:12 -06:00
Nicole Thomas
218b7f7a08
Merge pull request #46401 from garethgreenaway/46335_unicode_broke_the_x509_star 
[2018.3.0rc1] fixes to x509 module
 2018-03-16 13:57:53 -04:00
rallytime
fe2d46dd0c
Better merge conflict resolution for setup.py windows changes 2018-03-16 12:38:29 -04:00
rallytime
8886b61576
Update old utils paths to new paths 2018-03-15 17:31:29 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
twangboy
50a860b839
Remove unicode things 2018-03-15 12:55:26 -06:00
twangboy
8474006dab
Fix 2 tests 
Modifies the fibre_channel.py grain for linux to allow mocking. You
can't mock a file handle used in a for loop.
Fixes the mocking in test_windows_iscsi_iqn_grains. Apparently, you
can't stack multiple mocks in the same with statement.
 2018-03-15 11:15:57 -06:00
Nicole Thomas
1191d5b379
Merge pull request #46540 from s0undt3ch/2018.3 
Some missing `isinstance` checks.
 2018-03-15 12:17:19 -04:00
Nicole Thomas
048b2ba3f6
Merge pull request #46547 from garethgreenaway/46427_service_module_cumulus 
[2017.7] Disable service module for Cumulus
 2018-03-15 12:14:59 -04:00
Nicole Thomas
5429438e4b
Merge pull request #46513 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-15 11:58:59 -04:00
Nicole Thomas
98e3260b9a
Merge pull request #46548 from Ch3LL/profit_test 
profitbrick test: check for foo,bar username,password set in profitbrick config
 2018-03-15 10:25:27 -04:00
Nicole Thomas
79f2a76609
Merge pull request #46549 from Ch3LL/dimension_test 
Fix dimensionsdata test random_name call
 2018-03-15 10:23:40 -04:00
twangboy
5636ab7cd4
Fix some lint 2018-03-14 16:39:40 -06:00
twangboy
16949c0b93
Fix failing tests, add new tests 2018-03-14 16:37:42 -06:00
Ch3LL
bb338c464c
Fix dimensionsdata test random_name call 2018-03-14 15:28:06 -04:00
Ch3LL
db96c4e72e
check for foo,bar username,password set in profitbrick config 2018-03-14 14:57:48 -04:00
Gareth J. Greenaway
edd0b11447
Merge branch '2017.7' into 46427_service_module_cumulus 2018-03-14 11:51:52 -07:00
Gareth J. Greenaway
ea3c16080e
Disable the service module on Cumulus since it is using systemd. 2018-03-14 11:24:43 -07:00
Pedro Algarvio
fa1d668774
Some missing isinstance checks. Committed again through a PR. 2018-03-14 15:59:36 +00:00
Pedro Algarvio
78c0b77afd
Revert "Some missing isinstance checks". Pushed directly. 
This reverts commit 2a7dd73710.
 2018-03-14 14:01:22 +00:00
Pedro Algarvio
2a7dd73710
Some missing isinstance checks 2018-03-14 13:57:35 +00:00