valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,583 Commits 24 Branches 182 Tags 341 MiB
d17fbe96de
Commit Graph

72583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
d17fbe96de LXC execution module Carbon deprecations 2016-08-15 16:28:23 -06:00
Nicole Thomas
2a674fefef [develop] Update bootstrap script to latest stable (2016.08.15) (#35462) 2016-08-15 13:23:44 -06:00
Moe
39e43f30fc Add example yaml to win_snmp state (#35435) 2016-08-15 11:01:57 -06:00
Mihai Dincă
a5f982edeb Fix os_family check in zypper module (#35450) 2016-08-15 10:34:11 -06:00
Mike Place
cf924343b6 Merge pull request #35341 from dincamihai/develop 
Make sha256 the default hash_type
 2016-08-15 20:23:43 +09:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
Mike Place
a72dc59cf4 Merge pull request #35431 from m03/win_smtp_server-state-examples1 
Improve win_smtp_server state docstrings
 2016-08-15 16:00:53 +09:00
Morrie Winnett
d270d3622a Add example yaml to win_smtp_server state 2016-08-14 15:02:41 -07:00
Nicole Thomas
6b6f38b0ea Merge pull request #35424 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-13 09:49:14 -06:00
Mike Place
6b8d46975d Merge pull request #35414 from silviud/win_firewall_remoteip 
Win firewall remoteip
 2016-08-13 08:52:51 +09:00
Mike Place
d72f13d9c0 Merge pull request #35415 from meaksh/fix-suse-os-grains-in-develop 
Fixed 'os' and 'os_family' grains for SUSE systems in develop
 2016-08-13 08:50:52 +09:00
Mike Place
21e3874c2b Merge pull request #35421 from hrumph/saltenv_problem 
Pass saltenv to call to latest_version in list_upgrades function
 2016-08-13 08:48:04 +09:00
rallytime
a3a5496d0f Fix some items that went awry in the merge 2016-08-12 17:06:27 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Michael Walton
3a6152b626 Pass saltenv to call to latest_version in list_upgrades function 2016-08-12 15:52:16 -04:00
Nicole Thomas
2ef596673f Provide links to the renderers in the template docs (#35406) 
* Provide links to the renderers in the template docs

Follow-up for #35360, also references #35336

* Whitespace fix
 2016-08-12 12:27:44 -06:00
Mike Place
182d9a5bf8 Merge pull request #35383 from pablo-ruth/issue_19313 
Issue 19313 / Add support of lvm thinpools
 2016-08-12 21:47:26 +09:00
Mike Place
f26d279887 Merge pull request #35391 from jf/quickpatch 
Remove comment in code about issue that no longer applies (#3614), and improve logic for argspec_report
 2016-08-12 21:44:20 +09:00
Mike Place
85ecac8e6e Merge pull request #35392 from m03/more-win_iis-unit-tests 
Add list_apps, list_bindings, remove_site tests to win_iis_test
 2016-08-12 21:43:36 +09:00
Mike Place
b3e9e98b40 Merge pull request #35393 from deniszh/2016.3_fix35350 
No need to run ddns update every time
 2016-08-12 21:40:36 +09:00
Mike Place
a5fe05b7f9 Merge pull request #35407 from hu-dabao/fix-35094 
[Fix-35094] None will not be added to grains which generate [none]
 2016-08-12 21:34:05 +09:00
Pablo Suárez Hernández
7c1a5f8bc6 Fixed 'os' and 'os_family' grains for SUSE systems 2016-08-12 13:33:27 +01:00
Mike Place
06d5aac5c5 Merge pull request #35409 from m03/add-win_pki-examples 
Add example yaml to win_pki state
 2016-08-12 21:33:27 +09:00
Mike Place
4dc776ffbf Merge pull request #35411 from eliasp/2016.3-modules.event-handle-file_client-opt 
modules.event.send(): Prevent backtrace for masterless Minions
 2016-08-12 21:29:01 +09:00
Silviu Dicu
750fde2931 tests and remote_ip renamed to remoteip as per netsh 2016-08-12 08:01:14 -04:00
Silviu Dicu
8a5c9ec574 w/o _ 2016-08-12 08:01:14 -04:00
Silviu Dicu
dd7d6094b4 remoteip for win_firewall 2016-08-12 08:01:14 -04:00
Elias Probst
8d7244bdd9
modules.event.send(): Also check for file_client and use_master_when_local opts 2016-08-12 12:27:02 +02:00
Morrie Winnett
b3ccdc9ed0 Add example yaml to win_pki state 2016-08-11 23:10:53 -07:00
Garrett
9d35ea6642 Bug fixes for github module (#35397) 2016-08-11 20:16:59 -06:00
Hengyang Hu
a23108f795 None will not be added to grains which generate [none] 2016-08-11 16:20:37 -07:00
Nicole Thomas
4b33a19788 Merge pull request #35349 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-11 15:07:43 -06:00
Nicole Thomas
c032506e6b Merge pull request #35395 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-11 14:59:37 -06:00
rallytime
0d1aa630f1 Lint fix 2016-08-11 13:13:51 -06:00
rallytime
cf038ee3fe Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/file.py
  - salt/modules/hosts.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/portage_config.py
  - salt/modules/x509.py
  - salt/scripts.py
  - tests/integration/shell/enabled.py
 2016-08-11 11:33:54 -06:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394) 
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
 2016-08-11 11:00:36 -06:00
Mike Place
69a108e9fa Raise SaltRenderError on bad requisite (#35373) 
* Raise SaltRenderError on bad requisite

Refs #35226

* Remove extra vals
 2016-08-11 10:48:23 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359) 
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
 2016-08-11 10:45:24 -06:00
rallytime
69b9342d67 Update grains unit tests: osmajorrelease grain is a str, not an int. 
Refs #35227

These tests will need to be changed back to integers once Nitrogen
is released.
 2016-08-11 10:38:58 -06:00
Denis Zhdanov
6f2f080f4a No need to run dns update every time 
only if we replacing record or it doesn't exist.
 2016-08-11 18:25:47 +02:00
Thomas S Hatch
b570613f04 Merge pull request #35382 from isbm/isbm-snapper-dbus-crash-fix 
Bugfix: prevent snapper module crash on load if no DBus is available in the system
 2016-08-11 10:20:00 -06:00
Thomas S Hatch
9ea7a34c30 Merge pull request #35339 from isbm/isbm-2015.8-minion-importerror-fix 
Bugfix: Prevent continuous restart, if a dependency wasn't installed
 2016-08-11 10:15:16 -06:00
Morrie Winnett
c14ef8bde8 Add list_apps, list_bindings, remove_site tests 2016-08-11 09:12:52 -07:00
Jeffrey 'jf' Lim
c00b5c7e15 Better logic for argspec_report (retain exact matching) 2016-08-12 00:07:42 +08:00
Jeffrey 'jf' Lim
4201e25eca Remove comment that no longer applies: salt/utils/__init__.py 2016-08-11 23:43:40 +08:00
Pablo RUTH
50f96e8ac7 fix pylint trailing whitespace 2016-08-11 16:31:08 +02:00
Bo Maryniuk
b8fb447fc4 Turn off pylint on non-constant names in init block 2016-08-11 16:08:42 +02:00
Bo Maryniuk
50c35c3eca Disable pylint on module-level non-constant variables 2016-08-11 16:04:41 +02:00
Bo Maryniuk
5f96c48227 Add error message for missing snapper in a whole 2016-08-11 16:01:07 +02:00
Bo Maryniuk
637a2b76cf Add error check for snapper's object init 2016-08-11 15:56:05 +02:00