valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
79,727 Commits 24 Branches 182 Tags 341 MiB
340cbfec63
Commit Graph

79727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mguegan
340cbfec63 Update build instructions for esky / SmartOS (2016Q4 LTS) 
- Remove duplicates
 - Adding `-lssp` for fix linking of `console.exe` (bbfreeze)
 - Remove patchelf which will break bbfreeze `(version not found)`
 - Update to latest saltstack repository branch
 2017-03-22 19:25:14 +01: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
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
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
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
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
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
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
Nicole Thomas
33e918e3d1 Merge pull request #40185 from cloudflare/proxy-docs 
Proxy docs
 2017-03-21 14:24:49 -06:00
Nicole Thomas
1fe40548d2 Merge pull request #40187 from bewing/netacl_docs 
Update states.netacl documentation
 2017-03-21 14:22:23 -06:00
rallytime
a6a7538fe4 Pylint fix 2017-03-21 13:39:34 -06:00
Andrea Mistrali
079528fcd9 Pylint workaround 2017-03-21 18:22:21 +01:00
Mike Place
2554be3872 Merge pull request #39913 from jejenone/allow_unicode 
add encoding support to file.manage and file.serialize (module and state)
 2017-03-21 11:00:08 -06:00
Brandon Ewing
8a8ccbe69b Add additional detail regarding serialization 2017-03-21 11:40:59 -05:00
Mike Place
00d3838c25 Merge pull request #40186 from Mapel88/develop 
Update win_iis.py - fixed "get_webapp_settings"
 2017-03-21 10:35:39 -06:00
Nicole Thomas
c284a82dfa Merge pull request #40032 from tgoodlet/virt_fixups 
Some random salt-virt bug fixes and docs fixups
 2017-03-21 10:32:42 -06:00
rallytime
2222e1cae9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/napalm_network.py
  - tests/integration/states/test_archive.py
  - tests/integration/states/test_file.py
  - tests/unit/modules/test_docker.py
 2017-03-21 10:19:52 -06:00
Mike Place
95fafb476d Extra space for lint compliance 2017-03-21 10:10:27 -06:00
Mike Place
2608e1a8fd Merge pull request #40116 from hobgoblinsmaster/add-proxmox-api-introspection-try2 
Add proxmox api introspection try2
 2017-03-21 09:52:32 -06:00
Andrea Mistrali
3f787bdcf7 Optimized version of iphexval, plus better docstring 2017-03-21 16:49:22 +01:00
Brandon Ewing
b7ad84d2bf Update states.netacl documentation 
Update examples to explicitly use the json serializer instead of the
built-in Python serializer to avoid issues with serialized objects.

Correct the default for states.netacl.filter variable merge_pillar
 2017-03-21 10:39:22 -05:00
Mike Place
233e0e8cfc Merge pull request #40168 from fungus/patch-1 
Support for default item in match.filter_by
 2017-03-21 09:25:55 -06:00
Mike Place
3370d2de7c Merge pull request #39891 from isbm/isbm-translate-varargs 
Introduce "module.xrun"
 2017-03-21 09:23:28 -06:00
Mapel88
4dc9dfe504 Update win_iis.py 
Removed the 'r' prefix from this section cause it's not working with it:
                pscmd.append(r" $Property = Get-WebConfigurationProperty -Filter \"system.applicationHost/sites/site[@name='{0}']/application[@path='/{1}']/virtualDirectory[@path='/']\"".format(site, name))
                pscmd.append(r" -Name \"{0}\" -ErrorAction Stop | select Value;".format(setting))
                pscmd.append(r" $Property = $Property | Select-Object -ExpandProperty Value;")
                pscmd.append(r" $Settings['{0}'] = [String] $Property;".format(setting))
                pscmd.append(r' $Property = $Null;')
 2017-03-21 17:16:44 +02:00
Mircea Ulinic
01c5c77305 Add proxy_always_alive option from #40178 2017-03-21 14:59:16 +00:00
Mircea Ulinic
186a6c4f2a Add proxy options doc 2017-03-21 14:59:16 +00:00
Mircea Ulinic
97343733ad Proxy config Examples 2017-03-21 14:59:16 +00:00
Mircea Ulinic
1ba599b784 Include proxy config instructions 2017-03-21 14:59:11 +00:00
Erik Johnson
efe3df7b1e Merge pull request #40117 from narendraingale2/fix_force_remove 
Fix force remove
 2017-03-21 09:20:36 -05:00
Pedro Algarvio
a23e1cc4b8 Merge pull request #40180 from s0undt3ch/develop 
White-space lint fix
 2017-03-21 13:46:30 +00:00
Pedro Algarvio
d9f074d807
White-space lint fix 2017-03-21 13:44:55 +00:00
Mircea Ulinic
bdc179ac00 Adding proxy_always_alive opt 2017-03-21 12:17:56 +00:00
Bo Maryniuk
9e5bf58e42 Fix test: underscore alias is found 2017-03-21 10:49:18 +01:00
Bo Maryniuk
bceb6d0f56 Add with_deprecated test misconfiguration 2017-03-21 10:48:54 +01:00
Bo Maryniuk
54416ed2e8 Add with_deprecated test with opt-in policy configured 2017-03-21 10:47:26 +01:00
Bo Maryniuk
9f8bb257df Add with_deprecated test with opt-in policy by default 2017-03-21 10:46:53 +01:00
Bo Maryniuk
fe35e15ad1 Cover deprecated option 2017-03-21 10:46:04 +01:00
Bo Maryniuk
66dff82062 Fix unit test: log messages has been changed 2017-03-21 09:29:48 +01:00
Pedro Algarvio
8f462b6331 Merge pull request #40094 from twangboy/win_fix_testing 
Fix problems with the test suite on Py3
 2017-03-20 22:14:29 +00:00
Mike Place
c1408205ba Merge pull request #40103 from YuriGrigorov/40022 
Allow scheduled job to run if run time is in the past
 2017-03-20 15:55:45 -06:00
Mike Place
be4e66d93f Merge pull request #40132 from ninja-/fix_cron_py3 
Fix python2.6 support for cmdmod
 2017-03-20 15:42:44 -06:00
Mike Place
0c5c4d2a00 Merge pull request #40153 from cloudflare/fix-40137 
Fix #40137 (Problems with netacl.load_filter_config, load_policy_config, etc)
 2017-03-20 15:41:48 -06:00
Mike Place
257c862c52 Merge pull request #40160 from eldadru/fix-issue-40073-boto-rds-describe-empty-dict 
Fix this issue: https://github.com/saltstack/salt/issues/40073, descr…
 2017-03-20 15:37:42 -06:00