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
91,059 Commits 24 Branches 182 Tags 341 MiB
3d37eca847
Commit Graph

91059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Nicole Thomas
a43d999fb8
Merge pull request #46437 from terminalmage/issue44032-2018.3 
Improve reliability/idempotence of file.blockreplace state (2018.3 branch)
 2018-03-08 10:38:52 -05:00
Erik Johnson
4798187035
Improve reliability/idempotence of file.blockreplace state (2018.3 branch) 
This makes the following changes:

- The `append_newline` argument to the `file.blockreplace`
  remote-execution function has been modified so that if its value is
  `None`, it only appends a newline when the content block does not end
  in one.
- A couple of fixes were made to newline handling. The existing code
  normalized the newlines in the content block, replacing them with
  os.linesep. However, when the file contains newlines that don't match
  the OS (i.e. POSIX newlines in a file on a Windows box, or Windows
  newlines on a Linux/Mac/BSD/etc. box), then we would still end up with
  mixed newlines. The line separator is now detected when we read in the
  original file, and the detected line separator is used when writing
  the content block. Additionally, the same newline mismatch was
  possible when appending/prepending the content block. This has been
  fixed by using a common function for appending, prepending, and
  replacing the content block.
- Support for the `append_newline` argument has been added to the
  `file.blockreplace` state. The default value for the state is `None`.
  A `versionchanged` has been added to the remote execution function to
  let users know that the Fluorine release will change the default value
  of that variable.
- 20 new integration tests have been written to test the
  `file.blockreplace` state.
 2018-03-07 22:29:09 -06:00
Nicole Thomas
0c66507aff
Merge pull request #46328 from dincamihai/2018.3.0rc1 
Fix openscap push
 2018-03-07 12:51:41 -05:00
Mihai Dinca
b5e508f339 Fix openscap push 2018-03-07 14:55:50 +01:00
Nicole Thomas
82cb2ea5a0
Merge pull request #46174 from twangboy/win_fix_test_git_2 
Fix a unicode issue with the git module on Windows
 2018-03-06 13:53:53 -05:00
Nicole Thomas
7690cf8564
Merge pull request #46235 from twangboy/win_fix_test_ssh 
Fix `unit.modules.test_ssh` for Windows
 2018-03-05 15:39:43 -05:00
Nicole Thomas
c4f366cdd9
Merge pull request #46332 from terminalmage/merge-forward-docs 
Update the merge-forward docs to reference the 2018.3 branch
 2018-03-05 14:39:55 -05:00
Erik Johnson
0411845cec
Update the merge-forward docs to reference the 2018.3 branch 
This will make the docs for 2018.3.x more coherent once the docs for
2018.3 are pushed live.
 2018-03-05 10:04:30 -06:00
Nicole Thomas
241611aca5
Merge pull request #46307 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.0rc1 to 2018.3
 2018-03-03 07:56:06 -05:00
Nicole Thomas
30c34f0c62
Merge pull request #46314 from terminalmage/merge-2017.7-2018.3 
Merge 2017.7 branch into 2018.3
 2018-03-03 07:54:26 -05:00
Erik Johnson
61ab47ee70
Merge branch '2017.7' into merge-2017.7-2018.3 
Conflicts:
- salt/cloud/clouds/openstack.py
- salt/daemons/masterapi.py
- salt/master.py
- salt/modules/gentoo_service.py
- salt/pillar/__init__.py
- salt/pillar/git_pillar.py
- salt/runners/cache.py
- salt/runners/git_pillar.py
- salt/runners/winrepo.py
- salt/utils/docker/__init__.py
- salt/utils/gitfs.py
 2018-03-02 16:20:20 -06:00
Nicole Thomas
194b0317ac
Merge pull request #46287 from bbinet/upstream-pillarstack 
Update PillarStack stack.py to latest upstream version
 2018-03-02 16:39:51 -05:00
rallytime
c9fa21f62c
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-02 14:22:07 -05:00
Nicole Thomas
5ffa482343
Merge pull request #46285 from gtmanfred/2018.3.0rc1 
fix return dict for salt-ssh if something goes wrong
 2018-03-02 12:17:42 -05:00
Nicole Thomas
5416fcf6dc
Merge pull request #46275 from terminalmage/issue46274 
Make sure rest_cherrypy's config is all str types on PY2
 2018-03-02 12:15:33 -05:00
Erik Johnson
aeeb533225
Fix master conf test for PY3 
PY3 should have no non-unicode strings, this was a bug in the test
 2018-03-02 11:06:13 -06:00
Nicole Thomas
00ca4f01c1
Merge pull request #46269 from DSRCorporation/bugs/46202_msgpack_custom_types_rework 
msgpack custom types rework
 2018-03-02 11:22:55 -05:00
Daniel Wallace
417e45686b
add unit test 2018-03-02 07:48:26 -07:00
Nicole Thomas
cfbead0fc7
Merge pull request #46262 from The-Loeki/fix_sysctl 
sysctl.set can still not set unicode sysctl keys
 2018-03-02 09:34:12 -05:00
Dmitry Kuzmenko
2f2464b64d
Fix long int support for older msgpack versions. 2018-03-02 11:03:42 +03:00
Dmitry Kuzmenko
51c311bc1c
Payload Py3 fix and set handling. 2018-03-02 06:01:42 +03:00
Erik Johnson
d29d2fa074
Fix incorrect invocation of salt.config.include_config 
This was causing exit_on_config_errors to not be passed through, and
adding an `exit_on_config_errors` key to the master config.
 2018-03-01 13:43:41 -06:00
Erik Johnson
2f7ae45088
Add conf file unicode test for master 2018-03-01 13:43:33 -06:00
Ronald van Zantvoort
2bf834bc28
Merge branch '2018.3.0rc1' into fix_sysctl 2018-03-01 20:42:54 +01:00
Ch3LL
b9e0f0d565
Ensure minion id is unicode when minion_id_caching is set 2018-03-01 13:13:52 -06:00
Erik Johnson
4a738bfa63
Make sure rest_cherrypy's config is all str types on PY2 
CherryPy is not unicode-compatible.
 2018-03-01 12:42:41 -06:00
Bruno Binet
b14b6f2c95 Update PillarStack stack.py to latest upstream version 
which provide the following fixes/enhancements:
- https://github.com/bbinet/pillarstack/pull/37
- https://github.com/bbinet/pillarstack/pull/39
- https://github.com/bbinet/pillarstack/pull/42
 2018-03-01 18:07:38 +01:00
Daniel Wallace
de762765e5
fix return dict for salt-ssh if something goes wrong 
If we are unable to login go the minion, the return will not be a dictionary,
it will be a string.  We should still return this, but it needs to be in the
correct format.
 2018-03-01 09:51:07 -07:00
Ronald van Zantvoort
d6da2b62fe
the curious case of the missing comma 2018-03-01 17:45:12 +01:00
Nicole Thomas
dc2833aa87
Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework 2018-03-01 10:47:07 -05:00
Nicole Thomas
88a3166589
Merge pull request #46276 from terminalmage/issue44046 
salt.utils.docker.translate_input: operate on deepcopy of kwargs
 2018-03-01 10:37:43 -05:00
Nicole Thomas
fb978c0e16
Merge pull request #46278 from dincamihai/2018.3.0rc1 
Fix grains with '\n'
 2018-03-01 10:32:24 -05:00
Mike Place
f3e9e824de
Merge pull request #46267 from garethgreenaway/filter_hidden_schedule_option 
[2018.3.0rc1] Don't include internal schedule options
 2018-03-01 05:33:05 -07:00
Mihai Dinca
0eb03496eb Fix grains with '\n' 2018-03-01 11:17:24 +01:00
Erik Johnson
a14d4daf8c
salt.utils.docker.translate_input: operate on deepcopy of kwargs 
This keeps the translation from rewriting the low chunks and breaking
the watch requisite.
 2018-02-28 23:07:58 -06:00
Dmitry Kuzmenko
a664864ab1
Rework msgpack serialization of unsupported types in serial 2018-03-01 02:16:31 +03:00
Nicole Thomas
c862b4bf00
Merge pull request #46256 from rallytime/msgpack-python-0.5.5 
Don't install msgpack 0.5.5
 2018-02-28 17:51:29 -05:00
Gareth J. Greenaway
ca4bc3fe29
Filter out the internal schedule options when persisting the schedule to disk. Some of these are "special" types and do not represent when when written out, eg. datetime objects. Also ensuring that after all the calculations, the seconds value is an int and does not include partial second bits. 2018-02-28 14:27:33 -08:00
Nicole Thomas
da60399b8f
Merge pull request #46183 from oeuftete/fix-docker-container-running-host-config-ulimits 
Fix docker_container.running HostConfig Ulimits comparison
 2018-02-28 17:22:11 -05:00
Nicole Thomas
7382654c70
Merge pull request #46227 from Ch3LL/smtp_file_client 
Mock file_client call in smtp return test
 2018-02-28 17:12:22 -05:00
Nicole Thomas
509429f08c
Merge pull request #46260 from terminalmage/git_pillar 
Normalize global git_pillar/winrepo config items
 2018-02-28 17:05:25 -05:00
Dmitry Kuzmenko
4dfc44ac39
A basic fix for loading datetime objects with msgpack 2018-02-28 23:05:51 +03:00
Nicole Thomas
a97a3e6fb0
Merge pull request #46101 from jfindlay/openrc_ret 
In OpenRC exec module, make sure to ignore retcode on status
 2018-02-28 15:01:36 -05:00
Nicole Thomas
1a17593c05
Merge pull request #46254 from rallytime/enterprise-banner 
Update enterprise banner
 2018-02-28 14:54:03 -05:00
Ronald van Zantvoort
61c5397805
Bugfix setting sysctl keys with '/' in it 2018-02-28 20:50:42 +01:00
Nicole Thomas
123625213e
Merge pull request #46232 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-02-28 14:16:36 -05:00
Nicole Thomas
20d869c228
Merge pull request #46172 from The-Loeki/fix_cmd_run_all_bg_oxygen 
cmdmod: reimplementation of #45932 for Oxygen
 2018-02-28 14:14:26 -05:00
Nicole Thomas
faa90cc6c2
Merge pull request #46213 from terminalmage/unicode-opts 
PY2: Remove conversion of values from config file to str types
 2018-02-28 14:10:19 -05:00
Nicole Thomas
687575b582
Merge pull request #46238 from terminalmage/fds-in-fopen 
Don't allow salt.utils.files.fopen() to open stdin/stdout/stderr
 2018-02-28 14:08:22 -05:00