valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,314 Commits 24 Branches 182 Tags 341 MiB
e38db3985b
Commit Graph

76314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jared McKnight
e38db3985b fix the security groups that get applied to a new instance 2016-12-07 14:52:39 -05:00
Mike Place
f4b6f815d4 Merge pull request #38132 from iddocohen/develop 
Fixing bug in log.py - used .copy instead of .copy()
 2016-12-07 11:48:19 -07:00
Mike Place
4c11f39030 Merge pull request #38128 from eradman/cwd_param 
Adjust description for param cwd
 2016-12-07 11:33:00 -07:00
Nicole Thomas
ae754e1069 Mock config.option call return for iptables unit test (#38131) 
Refs #31662
 2016-12-07 11:19:46 -07:00
Iddo Cohen
9a9e443d36 Fixing bug in log.py - used .copy instead of .copy() 
Typo mistake which was fixed
 2016-12-07 18:06:45 +01:00
Nicole Thomas
9ce1ae8388 Merge pull request #38105 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-07 09:41:41 -07:00
Eric Radman
15f9c09ebf Adjust description for param cwd 
On most Linux systems root's home directory is '/root', but this is not
true on other platforms. On MacOS 10.12 for example, it is '/var/root'
or '/var/private/root'.

Also, the salt master may not be running as root, so perhaps it is best
to avoid making any promises about the current working directory if
``runas`` is not specified.
 2016-12-07 11:13:04 -05:00
Mike Place
a19fbeb72e Merge pull request #37796 from iddocohen/develop 
Added beacon for tracing string within log
 2016-12-07 06:59:54 -07:00
Mike Place
b131b93f20 Merge pull request #38108 from startupgrind/develop 
Fixes inability to remove untagged Docker images.
 2016-12-07 06:18:55 -07:00
rallytime
7693437fa0 Use tgt_type instead of expr_form in new run_job_async func 2016-12-06 22:59:23 +00:00
Brant Fitzsimmons
cd8a6b49e2 Merge pull request #1 from startupgrind/dangling_fix 
Fixes inability to remove untagged Docker images.
 2016-12-06 15:19:30 -05:00
Brant Fitzsimmons
665c9da331 Fixes inability to remove untagged Docker images. 2016-12-06 15:14:46 -05:00
rallytime
9b2bbe77ef Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/netapi/rest_tornado/saltnado.py
 2016-12-06 10:03:10 -07:00
Mike Place
2a1066eee1 Merge pull request #37982 from wolfpackmars2/patch-5 
Update ssh.py
 2016-12-06 07:29:45 -07:00
Mike Place
f8c67a9598 Merge pull request #38021 from mateiw/salt-ssh_master_tops 
Add master_tops support in salt-ssh
 2016-12-06 07:26:22 -07:00
Mike Place
ae3ac6089a Merge pull request #38086 from tsaridas/develop 
add option for syndics to forward all events to all masters
 2016-12-06 07:11:32 -07:00
Nicole Thomas
b7b0391da6 Add deprecation notices to nitrogen release notes (#38082) 2016-12-05 15:24:39 -07:00
Nicole Thomas
1bb31bbebd Start release notes file for 2016.11.1 release (#38084) 2016-12-05 15:24:11 -07:00
Iddo Cohen
ebbbf3f90c Adding str() for raw lines 2016-12-05 21:47:17 +01:00
Iddo Cohen
13f494cc12 Fixing PEP8 Errors 2016-12-05 21:43:30 +01:00
Andreas Tsaridas
f59ce3a2cf - remove comments 2016-12-05 21:41:25 +01:00
Andreas Tsaridas
69a0023a21 - change name and type of the config option 2016-12-05 21:41:20 +01:00
Andreas Tsaridas
342ca788db - add option for syndics to forward all events to all masters 2016-12-05 21:41:15 +01:00
Mike Place
78295516e7 Merge pull request #37878 from kstreee/2016.11 
Makes threads avoid blocking waiting while communicating using Zeromq.
 2016-12-05 12:50:46 -07:00
Mike Place
0809ccd429 Merge pull request #37987 from rbjorklin/consul-pillar-target 
consul_pillar support for limiting pillar exposure via minion targeting
 2016-12-05 12:48:20 -07:00
Mike Place
54ed167645 Merge pull request #38038 from ritazh/azurearmpr 
Allow NSG to be assigned to a new NIC for Azure ARM
 2016-12-05 12:35:05 -07:00
Mike Place
dd60542808 Merge pull request #31662 from dkiser/ipt_flex_out 
Proposed feature implementation for #31661
 2016-12-05 12:33:44 -07:00
Mike Place
e8f7b8fe29 Merge pull request #38074 from alexbleotu/get_datacenters_gh 
Get datacenters gh
 2016-12-05 11:59:49 -07:00
Mike Place
03069fe3f2 Merge pull request #38063 from llua/tmp_files_cleanup 
tmp file clean up in file.manage - fix for #33708
 2016-12-05 09:41:01 -07:00
Mike Place
83dcfe81ea Merge pull request #38067 from terminalmage/issue38062 
Remove virtual funcs for archive state/module
 2016-12-05 09:37:23 -07:00
Mike Place
fb984566d0 Merge pull request #37834 from ClaudiuPID/adds-icinga2-support 
Icinga2 module and state draft proposal.
 2016-12-05 08:59:01 -07:00
Alexandru Bleotu
2f428ef38f Added tests for utils.vmware.get_datacenter 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
50174acfbd Updated utils.vmware.get_datacenter to use utils.vmware.get_datacenters 2016-12-05 10:38:11 -05:00
Alexandru Bleotu
e8a854f9ac Added tests for utils.vmware.get_datacenters 2016-12-05 10:37:48 -05:00
Robin Björklin
5d0454a7ca Ignore W1401 (anomalous-backslash-in-string) 2016-12-05 13:41:47 +01:00
Alexandru Bleotu
364b6eb394 Added utils.vmware.get_datacenters which returns all datacenters in a vCenter 2016-12-05 07:24:12 -05:00
Robin Björklin
2e929a5ecc Linting fixes 2016-12-05 11:13:45 +01:00
Erik Johnson
2e0f26a084 Remove virtual funcs for archive state/module 
Since not all funcs require the CLI commands, the better way of handling
this is to check for presence of the needed funcs and gracefully exit a
state when the function is not present.
 2016-12-04 23:31:51 -06:00
Mike Place
c9933670f9 Merge pull request #38058 from rallytime/remove-init-db-dep 
Remove initdb dependency in postgres module
 2016-12-03 21:19:01 -07:00
Eric Cook
48c4ee6f31 tmp file clean up in file.manage - fix for #33708 2016-12-03 01:15:59 -05:00
rallytime
c1ceeca3d3 Remove initdb dependency in postgres module 
The initdb dep was removed in #37993 to fix #37935, but was
subsequently (likely accidentally) added back to the module
in PR #38023.
 2016-12-02 13:03:20 -07:00
Mike Place
1ac53e5196 Merge pull request #38004 from terminalmage/issue37969 
Fix regression in user/group mgmt for archive.extracted
 2016-12-02 11:28:48 -07:00
Mike Place
65a0f102fd Add/remove newlines 
Needed for the lint check to pass.
 2016-12-02 11:27:06 -07:00
Mike Place
e90cbbef08 Merge pull request #38051 from Ch3LL/fix_hash_docs 
add docs for hash_type change to sha256
 2016-12-02 11:11:36 -07:00
Mike Place
723699fda9 Merge pull request #38047 from cloudflare/NETCONFIG-STATE 
New state: netconfig
 2016-12-02 09:41:32 -07:00
Ch3LL
e95f88fbe3 add docs for hash_type change to sha256 2016-12-02 09:28:50 -07:00
Mircea Ulinic
3375e5fe30
netconfig state doc 2016-12-02 13:27:44 +00:00
Mircea Ulinic
80a76bb78f
New state: netconfig 2016-12-02 12:23:09 +00:00
Iddo Cohen
7e8f144beb Deleted licence and changed tabs 2016-12-02 11:11:34 +01:00
Mike Place
e4c5c29b28 Remove trailing whitespace 2016-12-02 02:50:56 -07:00