valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
79,810 Commits 24 Branches 182 Tags 341 MiB
235a768872
Commit Graph

79810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
235a768872 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
 2017-03-22 17:44:08 -06:00
Mike Place
f1686009b3 Merge pull request #40230 from twangboy/win_pkg_py3 
Add changes suggested by contributer
 2017-03-22 17:15:24 -06:00
Mike Place
c40376250f Merge pull request #40231 from rallytime/bp-40030 
Back-port #40030 to 2016.11
 2017-03-22 17:14:40 -06:00
Mike Place
e39f5cbf40 Merge pull request #40239 from saltstack/revert-40225-waitforfun 
Revert "Add wait_for_fun() to set_tags()"
 2017-03-22 16:59:15 -06:00
Mike Place
95bdab87b4 Revert "Add wait_for_fun() to set_tags()" 2017-03-22 16:58:57 -06:00
Mike Place
db1d76c7e8 Merge pull request #40233 from fishhead108/vmware_reboot_from_guest_vm_2016.11.3 
Enable soft reboot a VM via salt-cloud & VMware driver
 2017-03-22 16:32:36 -06:00
Mike Place
cae6a378f9 Merge pull request #40235 from lorengordon/lgpo-deepdiff 
Uses a deep diff to compare lgpo policy changes
 2017-03-22 16:31:20 -06:00
Mike Place
4e01fe196a Merge pull request #40236 from twangboy/win_fix_imports 
Fix my bad advice...
 2017-03-22 16:28:39 -06:00
twangboy
f3b010ebe5 Fix imports 2017-03-22 15:37:38 -06:00
Loren Gordon
65261dd60b Uses a deep diff to compare lgpo policy changes 2017-03-22 17:30:22 -04:00
Dmitry Miroshnichenko
9e380a739a Docs added 2017-03-22 23:23:44 +03:00
Narendra Ingale
4d1c687cbd Using lchown insted of chown. 2017-03-22 13:58:21 -06:00
Narendra Ingale
52b3d986b5 Added changes for fix_39445 2017-03-22 13:58:21 -06:00
twangboy
9c2570b466 Fix dict key error 2017-03-22 13:25:00 -06:00
Mike Place
54a9796f39 Merge pull request #40060 from techhat/venafi 
Add Venafi support
 2017-03-22 13:19:15 -06:00
twangboy
3bad922fa6 Add saltenv to uninstaller 2017-03-22 13:17:57 -06:00
Mike Place
d9903d2197 Merge pull request #39279 from alkivi-sas/win-user-language 
fix: no more test against SYSTEM user
 2017-03-22 13:07:35 -06:00
Mike Place
8d2630755b Merge pull request #39639 from The-Loeki/dns-enh 
[RFC/WIP]: Enhancement and cleanup of DNS functionalities
 2017-03-22 12:52:45 -06:00
Mike Place
5a1f352c59 Merge pull request #39749 from nafg/patch-1 
WIP: Add "Edit on GitHub" link to the docs
 2017-03-22 12:48:34 -06:00
twangboy
ba9622945e Add changes suggested by contributer 2017-03-22 12:46:22 -06:00
Mike Place
11d2f5abec Merge pull request #40225 from techhat/waitforfun 
Add wait_for_fun() to set_tags()
 2017-03-22 12:15:34 -06:00
Mike Place
37b5a3ccda Merge pull request #40224 from Mapel88/develop 
fix "create_binding"
 2017-03-22 12:14:46 -06:00
Mike Place
3507b7a241 Merge pull request #39954 from moio/fix-fileclient-race-condition 
Fix race condition on cache directory creation
 2017-03-22 12:12:32 -06:00
Mike Place
d765661c54 Merge pull request #39996 from terminalmage/docker-overhaul 
Overhaul Docker support
 2017-03-22 12:10:06 -06:00
Mike Place
7fbb435796 Merge pull request #40040 from jerrykan/apt_key_text 
Add `key_text` option to apt `pkgrepo.managed` (closes #37936)
 2017-03-22 12:08:38 -06:00
Joseph Hall
0dad2cd3f4 Use int for check 2017-03-22 11:54:00 -06:00
Joseph Hall
a54d005dfd Address more comments from @cachedout 2017-03-22 11:53:11 -06:00
Mike Place
c8cfbb7df6 Merge pull request #40172 from dmurphy18/fix_solaris_network 
Fix solaris network
 2017-03-22 11:41:55 -06:00
Mike Place
2557943710 Merge pull request #40178 from cloudflare/proxy-always-alive 
Adding proxy_always_alive opt
 2017-03-22 10:56:29 -06:00
Joseph Hall
89b5010883 Add wait_for_fun() to set_tags() 2017-03-22 10:50:44 -06:00
Mike Place
07d374a73e Merge pull request #40188 from akelge/develop 
Optimized version of iphexval, plus better docstring
 2017-03-22 10:48:05 -06:00
Mike Place
4eed0215fd Merge pull request #40215 from tgoodlet/qcow_support 
Add qcow support!
 2017-03-22 10:36:40 -06:00
Mike Place
e9a4e8548b Merge pull request #40210 from rallytime/test-skip 
Skip flaky test for now
 2017-03-22 10:34:40 -06:00
Mapel88
ee02352938 fix "create_binding" 
sslflags is not supported in server 2008.
Added an option to run "create_binding" without sslflags
 2017-03-22 18:20:54 +02:00
Erik Johnson
b88e8067c0 Check container diff for evidence of improper arg handling in earlier releases 
Also fix an issue with the result was not set to None when running the
state in test mode.
 2017-03-22 11:07:48 -05:00
Erik Johnson
b77f5b9630 Add warning about possible replaced containers on first run after upgrade 2017-03-22 09:19:20 -05:00
Erik Johnson
994892b48e Add note about upgrading to new Docker Python bindings 2017-03-22 09:11:31 -05:00
Dmitriy Miroshnichenko
aa67ea2000 Typos 2017-03-22 16:17:43 +03:00
Dmitriy Miroshnichenko
c3a042a533 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-03-22 16:12:29 +03:00
Dmitriy Miroshnichenko
7a2450f8c5 Fixed - 'NoneType' object has no attribute 'info' 2017-03-22 15:50:47 +03:00
Tyler Goodlet
018d3a6569 Add qcow support! 
This enables super fast cloning using the very impressive copy-on-write
image format from qemu.
 2017-03-21 19:25:55 -04:00
Dmitry Miroshnichenko
3f49679965 Changed argument positions 2017-03-22 02:09:03 +03:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
Dmitry Miroshnichenko
11ef3d0ef4 Added soft reset and shutdown 2017-03-22 00:51:11 +03:00
rallytime
0ba773d86b Skip flaky test for now 2017-03-21 15:47:20 -06:00
Nicole Thomas
6035ff1459 Merge pull request #40191 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-21 15:46:57 -06:00
Erik Johnson
0b00489eb2 Merge pull request #40209 from sofixa/2016.11 
change InfluxDB get_version to expect status code 204
 2017-03-21 16:42:25 -05:00
Nicole Thomas
66bc680d0a Merge pull request #40202 from saltstack/revert-39935-namespace_proxy_cfg 
Revert "Add special token to insert the minion id into the default_include path"
 2017-03-21 15:37:32 -06:00
Adrian Todorov
e1cc7234ff change InfluxDB get_version to expect status code 204 2017-03-21 22:30:39 +01:00
Mike Place
d8f0b79997 Merge pull request #40199 from whiteinge/ponysay-emergency-hotfix 
Ponysay emergency hotfix
 2017-03-21 15:10:21 -06:00