valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,377 Commits 24 Branches 182 Tags 341 MiB
7e3e71ca23
Commit Graph

96377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wozniak
7e3e71ca23
Merge pull request #51756 from twangboy/fix_case_sensitive 
Make recurse and directory case sensitive
 2019-02-22 16:06:10 -07:00
twangboy
4c55040ecf
Fix failing py3 tests 
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
 2019-02-22 11:44:39 -07:00
twangboy
64f45f8650
Make recurse and directory case sensitive 2019-02-22 11:44:39 -07:00
Daniel Wozniak
e75fc1c603
Merge pull request #51747 from ymasson/fix_mysql_grants 
Fix escaping for special charaters
 2019-02-22 11:20:17 -07:00
Thomas S Hatch
b1f7e85b4f
Merge pull request #51387 from chrillux/make-binarydata-output-possible 
Make binary data output possible
 2019-02-22 07:53:24 -07:00
Yann Masson
f614dd7d54
Fix escaping for special charaters 
Issue #49297
 2019-02-21 18:41:05 +01:00
Daniel Wozniak
3475813d13
Merge pull request #51694 from assafShapira/2018.3 
fix minion bootstrapping issue
 2019-02-21 10:38:55 -07:00
Daniel Wozniak
c7136cbd3f
Merge pull request #51738 from garethgreenaway/nftables_cleanup 
[2018.3] Nftables cleanup
 2019-02-21 10:25:43 -07:00
Daniel Wozniak
21210492de
Merge pull request #51733 from s0undt3ch/features/nox-2018.3 
[2018.3] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
 2019-02-21 10:22:14 -07:00
Gareth J. Greenaway
8201d1e04f
Fixing lint. 2019-02-20 12:17:57 -08:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup 2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests. 2019-02-20 09:52:54 -08:00
Pedro Algarvio
f4adf33977
Merge pull request #51728 from gtmanfred/virtualnames 
fix modulenames from virtualnames tests
 2019-02-20 17:45:54 +00:00
Gareth J. Greenaway
ed1b743664
Additional cleanup. Adding additional documentation for state module. 2019-02-20 09:31:01 -08:00
Pedro Algarvio
97532c2a68
Add initial nox configuration. Tell tox'ers to use nox'. 2019-02-20 16:49:16 +00:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests 2019-02-20 08:06:29 -06:00
Assaf Shapira
895b97a295
Merge branch '2018.3' into 2018.3 2019-02-20 12:07:24 +02:00
Daniel Wozniak
d681fb9eb8
Merge pull request #51721 from dwoz/solarisipstests 
[2018.3] Skip solarisips when not on solaris
 2019-02-20 01:18:33 -07:00
Daniel A. Wozniak
3263d31592
Merge remote-tracking branch 'saltstack/2018.3' into solarisipstests 2019-02-20 01:17:36 -07:00
Daniel Wozniak
fb0a538d05
Merge pull request #51676 from Ch3LL/merge-2018.3.4 
[2018.3] Merge forward from 2018.3.4 to 2018.3
 2019-02-20 01:14:21 -07:00
Daniel Wozniak
8111479346
Merge branch '2018.3' into merge-2018.3.4 2019-02-20 01:13:19 -07:00
Daniel Wozniak
e08f08d46c
Merge pull request #50812 from gtmanfred/virtualnames 
include the virtualname in the file name for core modules
 2019-02-20 01:12:30 -07:00
Gareth J. Greenaway
dc4afbb8b4
More updates to nftables module, state modules, and unit tests. 2019-02-19 17:42:19 -08:00
Daniel A. Wozniak
9caafeca61
Skip solarisips when not on solaris 2019-02-19 16:59:10 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames 2019-02-19 16:59:42 -06:00
Daniel Wozniak
31c6785be6
Merge pull request #51714 from dwoz/gemstestagain_2018.3 
[2018.3] Fix ruby gems tests, again
 2019-02-19 14:44:03 -07:00
Daniel A. Wozniak
fab74bb78d
Fix ruby gems tests, again 2019-02-19 14:11:39 -07:00
Daniel A. Wozniak
2ca1253fba
Merge branch 'merge-2018.3.4' of github.com:Ch3LL/salt into merge-2018.3.4 2019-02-19 14:05:05 -07:00
Daniel A. Wozniak
b5a626590c
Fix ruby gems tests, again 2019-02-19 14:04:45 -07:00
Daniel Wozniak
6d6910ab70
Merge branch '2018.3' into merge-2018.3.4 2019-02-19 13:36:03 -07:00
Daniel Wozniak
39aadfb243
Merge pull request #51689 from gtmanfred/2018.3 
specify minimum version of shade module
 2019-02-19 13:13:52 -07:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Gareth J. Greenaway
3ec96e36e2
initial work to cleanup the nftables module, state module, and the unit tests. 2019-02-19 10:44:01 -08:00
Daniel Wallace
8c35d51fc1
fix import 2019-02-19 12:16:20 -06:00
Megan Wilhite
05f2797f8f
Merge branch '2018.3' into merge-2018.3.4 2019-02-19 11:26:03 -05:00
assaf shapira
bc2d27ac89 fix minion bootstrapping issue 
"/usr/lib/python2.7/site-packages/salt/utils/cloud.py", line 472
Configuration value u'provider' needs to be set
 2019-02-18 15:19:03 +02:00
Pedro Algarvio
a475b70a65
Merge pull request #51469 from s0undt3ch/hotfix/fix-suse-locale-docker 
Don't prevent `get_locale` from working when running under Suse docker containers
 2019-02-17 19:06:23 +00:00
Pedro Algarvio
9f0999f99d
Merge branch '2018.3' into merge-2018.3.4 2019-02-17 18:43:05 +00:00
Pedro Algarvio
a59585d80e
Merge pull request #51671 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-02-17 18:41:43 +00:00
Daniel Wallace
6a55cfdf46
specify minimum version of shade module 2019-02-17 08:10:32 -06:00
Gareth J. Greenaway
b8764fd3a9
Merge pull request #51680 from Ch3LL/bp-50336 
Backport #50336 into 2018.3
 2019-02-15 16:31:14 -08:00
Alexey Pronin
3502dbba8c
states.gpg: fix missing existing keys; modules.gpg: fix set trust level command 2019-02-15 16:04:00 -05:00
Ch3LL
139daa8e44
Merge branch '2018.3.4' into 2018.3 2019-02-15 15:49:40 -05:00
Ch3LL
64322db582
Fix is_windows utils call 2019-02-15 15:18:24 -05:00
Ch3LL
a5c8df0323
Fix pylint 2019-02-15 14:41:21 -05:00
Ch3LL
547889b375
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/req.txt
  - salt/_compat.py
  - salt/engines/slack.py
  - salt/modules/dockermod.py
  - salt/modules/git.py
  - salt/modules/heat.py
  - salt/modules/incron.py
  - salt/modules/lxc.py
  - salt/modules/memcached.py
  - salt/modules/network.py
  - salt/modules/nspawn.py
  - salt/modules/saltutil.py
  - salt/modules/win_network.py
  - salt/modules/yumpkg.py
  - salt/serializers/yaml.py
  - salt/states/heat.py
  - salt/states/module.py
  - salt/states/rabbitmq_policy.py
  - salt/states/virtualenv_mod.py
  - salt/states/win_system.py
  - salt/utils/master.py
  - tests/integration/cli/test_batch.py
  - tests/support/case.py
 2019-02-15 14:38:26 -05:00
Shane Lee
a8898f6c9d
Merge pull request #51635 from lomeroe/lgpo_boolean_element_fix 
Properly create the value for a "True" boolean element item
 2019-02-14 13:35:56 -07:00
Shane Lee
b97c2b26b7
Merge branch '2018.3' into lgpo_boolean_element_fix 2019-02-14 13:35:37 -07:00
Shane Lee
5a98fb9751
Merge branch '2018.3' into lgpo_boolean_element_fix 2019-02-14 13:35:19 -07:00
Gareth J. Greenaway
abd37605cb
Merge pull request #51610 from garethgreenaway/51266_schedule_enable_disable_break_save 
[2018.3] Fixing schedule when enabled/disabled and saved
 2019-02-14 12:07:36 -08:00