Peter Hall
e0188cfa11
Adds zip64 switch to archive.zip.
2018-03-30 22:42:09 +02:00
Mike Place
376279172b
Merge pull request #46772 from bmiguel-teixeira/develop
...
fix container removal if auto_remove was enabled
2018-03-30 14:39:48 -06:00
Mike Place
caef32b5f2
Merge pull request #46777 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 10
2018-03-30 11:55:56 -06:00
Mike Place
a8253802f0
Merge pull request #46782 from ksofa2/fix-groupname-bug
...
Fix gid not found bug
2018-03-30 11:53:58 -06:00
root
2c35f9c912
avoid breaking if AutoRemove is not found
2018-03-30 14:59:39 +01:00
Kris Steinhoff
57e04bdafd
Fix gid not found bug
2018-03-29 17:35:45 -04:00
Ethan Devenport
fc67261e65
Merge branch 'develop' into public_private_ip
2018-03-29 11:31:04 -06:00
Nick Zeljkovic
41960137a8
Merge branch 'develop' into configserializer
2018-03-29 18:27:23 +02:00
rallytime
a0dda1f45c
Reduce the number of days an issue is stale by 10
2018-03-29 11:11:49 -04:00
Nicole Thomas
fa45de9944
Merge pull request #46634 from dwoz/testsfailfast
...
Add `fail-fast` option to test runner
2018-03-29 10:53:41 -04:00
Nicole Thomas
58d5c7b6bf
Merge pull request #46763 from flavio/fix-virtual-subtype-grain-detection-containers
...
Fix 'virtual_subtype' grain detection for kubernetes and libpod containers
2018-03-29 10:39:43 -04:00
Nicole Thomas
6fb83b7c83
Merge pull request #46694 from StackPointCloud/volume_password
...
Volume password
2018-03-29 10:10:11 -04:00
Nick Zeljkovic
2d7c78bc6b
Merge pull request #1 from terminalmage/pr-46748
...
Additional changes to complete upstream PR #46748
2018-03-29 11:03:12 +02:00
Daniel A. Wozniak
78c9cb9584
Fix TestResult constructor calls
2018-03-28 21:09:59 -07:00
Nicole Thomas
01a87c8a29
Merge pull request #46688 from s0undt3ch/hotfix/schedule-fixes
...
[develop][schedule] Schedule fixes/feature
2018-03-28 17:12:01 -04:00
Nicole Thomas
8267ced689
Merge pull request #46719 from rallytime/fix-46467
...
Remove support for expr_form
2018-03-28 17:11:08 -04:00
cDR
1171e65938
Update vault.py
...
added log notice for missing entries
use get()
2018-03-28 21:01:08 +02:00
Bruno Teixeira
23d60b9977
fix container removal if auto_remove was enabled
2018-03-28 19:27:41 +01:00
Nicole Thomas
09927ccda9
Merge pull request #46687 from s0undt3ch/hotfix/run-in-background
...
[develop][schedule] Fix run in background when it's set to false
2018-03-28 14:03:23 -04:00
Nicole Thomas
092c1905cc
Merge pull request #46735 from rallytime/merge-develop
...
[develop] Merge forward from 2018.3 to develop
2018-03-28 13:35:45 -04:00
Flavio Castelli
ac1d943394
Fix 'virtual_subtype' grain for kubernetes and libpod containers
...
All the containers started by kubelet (hence kubernetes) are assigned
to the `kubepods` cgroup slice (see [1]). That happens despite of the
Container Runtime Interface being used.
Containers started via tools using `libpod` [2] (eg: podman) are
assigned to the `libpod_parent` cgroup slice.
[1] https://github.com/kubernetes/community/blob/master/contributors/design-proposals/node/node-allocatable.md#recommended-cgroups-setup
[2] https://github.com/projectatomic/libpod
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
2018-03-28 19:07:31 +02:00
cDR
5e6351d7b8
Update vault.py
2018-03-28 17:19:38 +02:00
Erik Johnson
885c60e7d4
Add serializer_opts feature to Fluorine release notes
2018-03-28 09:56:15 -05:00
Erik Johnson
700f71dd5f
Add test case for serializer_opts
2018-03-28 09:55:35 -05:00
Erik Johnson
e6ad0b2b0c
Minor tweaks to new serializer_opts support
...
- `default_serializer_opts` renamed to `options`. This makes the
argument naming more accurate, since the kwargs we pass to the
serializer will no longer necessarily be the defaults.
- `repack_dictlist` no longer imported into the global scope. We don't
gain any efficiency by doing so, and importing a function into the
global scope has 2 side effects: 1) that function's docstring gets
processed by the Sphinx autosummary when building the docs, meaning
that we'll get docs for `repack_dictlist` in the file state docs, and
2) a `file.repack_dictlist` entry will be added to the dictionary of
available states, even though no such state exists.
- additional documentation added
2018-03-28 09:47:16 -05:00
rallytime
81211f07fd
Remove 2 tests from core grains unit tests
...
These tests were moved to tests/unit/grains/test_iscsi.py in PR #46530
During the merge-forward commit, the tests were inadvertently added back
into the test_core.py file during the merge-conflict resolution.
2018-03-28 10:14:20 -04:00
rallytime
c6116a83aa
Add **kwargs back into grains and pillar funcs in cache runner
...
This was removed during the deprecation removal process and shouldn't have been.
2018-03-28 09:58:13 -04:00
Cédric Bosdonnat
7abcaf26b0
Add engine relaying libvirt events
...
Libvirt API offers clients to register callbacks for various events.
libvirt_events engine will listen on a libvirt URI (local or remote)
for events and send them to the salt event bus.
Special thanks to @isbm for the code cleanup help
2018-03-28 15:38:25 +02:00
Nick Zeljkovic
e079993b5b
Add serializer options passing
2018-03-28 10:50:53 +02:00
denza
01cf2aef62
Merge branch 'develop' of github.com:saltstack/salt into reserve_public_ip
2018-03-28 05:41:27 +02:00
denza
377d0c085f
Merge branch 'develop' of github.com:saltstack/salt into public_private_ip
2018-03-28 05:40:18 +02:00
denza
0e52faf8e7
Merge branch 'develop' of github.com:saltstack/salt into volume_password
2018-03-28 05:39:27 +02:00
denza
734f5a77d4
pylint error fix
2018-03-28 05:26:41 +02:00
denza
f53e186411
Fixing typo
2018-03-28 05:19:15 +02:00
denza
d0315cde49
Adding a method doc comment
2018-03-28 05:07:14 +02:00
rallytime
0dfc4eeb41
Update release versions for the develop branch
2018-03-27 14:25:20 -04:00
Pedro Algarvio
81e851e290
Fix inversed logic
2018-03-27 18:41:16 +01:00
Pedro Algarvio
1478316a0d
Don't change the process name if not on a new process
2018-03-27 18:41:16 +01:00
Pedro Algarvio
19db8b2486
Allow getting a new schedule instance and not the singleton instance.
2018-03-27 18:41:16 +01:00
Pedro Algarvio
6bf400047f
We need to go through handle_func
2018-03-27 18:17:34 +01:00
Pedro Algarvio
21dd4d5745
Add support for job dry runs
2018-03-27 18:16:16 +01:00
Pedro Algarvio
b70461f1b5
Reuse code that actually runs the job
2018-03-27 18:16:15 +01:00
Erik Johnson
e536562409
Add documentation for how to create a container with no networks
2018-03-27 11:03:06 -05:00
Erik Johnson
36c98a1872
Add test to confirm behavior for explicit network configuration
2018-03-27 11:01:33 -05:00
Erik Johnson
3e23e4707a
Check unparsed networks to decide whether or not to disconnect
2018-03-27 11:01:33 -05:00
Erik Johnson
f3983c8254
Make busybox image builder work with newer busybox releases
2018-03-27 11:01:33 -05:00
Erik Johnson
60fd4bdd6d
Remove debugging comment in docker integration tests
2018-03-27 11:01:32 -05:00
Erik Johnson
87c1738e0a
Disconnect any unspecified docker networks
2018-03-27 11:01:32 -05:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop'
...
Conflicts:
- salt/modules/kubernetes.py
- salt/states/netconfig.py
- salt/states/zfs.py
- tests/integration/cloud/providers/test_profitbricks.py
- tests/integration/scheduler/test_eval.py
- tests/unit/grains/test_core.py
- tests/unit/test_pillar.py
2018-03-27 11:57:29 -04:00
rallytime
00490ec569
Update Fluorine release notes to use double back-ticks instead of single back-ticks
...
RST formatting needs double backticks to properly display `code` font markings. The
use of single backticks is used in markdown.
2018-03-27 11:27:12 -04:00