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
Mike Place
1b52289508 Merge pull request #38028 from terminalmage/issue38000 
Pass full_return to saltutil.runner
 2016-12-02 02:49:31 -07:00
kstreee
9103878c4f Fixes blocking waiting through implementing a socket pool class. 2016-12-02 18:47:33 +09:00
Robin Björklin
171cab1726 Fixed possible incorrect behavior if target wasn't on start/end of str 2016-12-02 10:47:26 +01:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type 
Deprecate expr_form argument in the LocalClient
 2016-12-02 02:45:16 -07:00
Mike Place
41c44ff684 Merge pull request #38044 from terminalmage/issue37980 
Remove debugging code
 2016-12-02 02:43:44 -07:00
Erik Johnson
f70a0409b3 Remove debugging code 
This was left in to debug per-saltenv config overlays. I thought I had
removed it weeks ago, but I guess I didn't, and it made it into
2016.11.0. This commit removes the debugging code.
 2016-12-01 23:20:01 -06:00
Rita Zhang
e3eeacd5aa Allow NSG to be assigned to a new NIC for Azure ARM 
* Add support for attaching network security group to a new network interface
* Add check for security_group in the configuration file
 2016-12-01 14:50:42 -08:00
Mike Place
9661258f22 Merge pull request #38035 from dmurphy18/fix_debbuild 
Updated to return status from make_repo similar to rpmbuild.py
 2016-12-01 15:30:53 -07:00
Erik Johnson
94a16ada7b Replace usage of deprecated expr_form in tests 2016-12-01 16:21:49 -06:00
Mike Place
47956ffd0c Merge pull request #38014 from StreetHawkInc/develop 
Fix 'changes' for pip.installed from requirements
 2016-12-01 15:14:18 -07:00
Mike Place
ebd09bcab4 Merge pull request #38008 from m03/aptpkg-pylint-fixes_1 
Fix several minor linting issues with aptpkg in develop
 2016-12-01 15:12:25 -07:00
Mike Place
141b5c5656 Merge pull request #38023 from gtmanfred/2016.11 
Expand error message for postgres states
 2016-12-01 15:05:06 -07:00
Mike Place
faf94a10a0 Merge pull request #38030 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-12-01 15:03:32 -07:00
Mike Place
b5d3cee033 Merge pull request #38031 from skizunov/develop2 
Windows: Fix exception when certain grains are None
 2016-12-01 15:02:51 -07:00
Mike Place
4f50d8e73c Merge pull request #38033 from terminalmage/update-systemd-mask-tests 
Update systemd module unit tests to reflect new masking behavior
 2016-12-01 15:01:59 -07:00
Erik Johnson
ac2f4e3ab9 Update systemd module unit tests to reflect new masking behavior 2016-12-01 14:21:33 -06:00
Sergey Kizunov
97bf90c5c9 Windows: Fix exception when certain grains are None 
Certain grains may be set to `None` due to PR #37593. When either
the `manufacturer` or `productname` grain is `None` due to the cleaning
feature from the above referenced PR, an exception will be thrown that
looks like:

```
File "...\salt\grains\core.py", line 442, in _windows_virtual
  if 'QEMU' in osdata.get('manufacturer', ''):
TypeError: argument of type 'NoneType' is not iterable
```

Fix this by making `_windows_virtual` tolerant to grains that have
a value of `None`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-12-01 14:02:48 -06:00
Nicole Thomas
79486421f5 Merge pull request #38026 from rallytime/bp-38015 
Back-port #38015 to 2016.11
 2016-12-01 12:16:15 -07:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.11.0.rst
 2016-12-01 12:14:33 -07:00
David Murphy
3bca96e7f2 Updated to return status from make_repo similar to rpmbuild.py 2016-12-01 11:45:10 -07:00
Erik Johnson
9bf13d55b4 Pass full_return to saltutil.runner 
This preserves the traditional return data structure for normal usage
while allowing for the full return in orchestration.
 2016-12-01 12:18:05 -06:00
m03
62479f2792 Fix comment 2016-12-01 09:57:43 -08:00
Konrad Mosoń
11becf3e68 Typo fix 2016-12-01 10:23:27 -07:00
Dmitry Kuzmenko
e51448f5ed Added Carbon release notes. Fixed sphinx errors in the file. (#38022) 2016-12-01 09:59:15 -07:00
Konrad Mosoń
015f5b8105 Typo fix (#38015) 2016-12-01 09:54:21 -07:00
Nicole Thomas
6f34332e87 Adjust code examples to use the actual bootstrap-salt.sh file name (#38011) 2016-12-01 09:01:25 -07:00
Daniel Wallace
1aa43eba80 Expand error message for postgres states 
Also revert pg_bin back to bins_dir
 2016-12-01 09:40:00 -06:00
Daniel Wallace
ac72ee600e Revert "Updated the bins_dir to default to pg_bin #37935" 
This reverts commit a96789353f.
 2016-12-01 09:34:34 -06:00
Claudiu Popescu
612411095a Pylint fix 2016-12-01 16:23:30 +02:00
Matei Albu
7037fa116d Add master_tops support in salt-ssh 2016-12-01 14:38:51 +01:00
Claudiu Popescu
d532ad78ea Icinga2 module fixes 2016-12-01 12:51:35 +02:00
Steven Joseph
3fbf5fcdba Fix 'changes' for pip.installed from requirements 
- add more lines for matching no change from pip
 2016-12-01 16:55:47 +11:00
m03
c75f360fd0 Fix several minor linting issues with aptpkg 2016-11-30 12:33:08 -08:00
Mike Place
84e4fe1bd7 Merge pull request #37998 from Ch3LL/add_init_delay 
Add init delay
 2016-11-30 13:23:01 -07:00
Mike Place
1e3bb2e12a Newline for lint 2016-11-30 13:22:53 -07:00
Erik Johnson
23bb90a7ce Add integration test for archive.extracted with user/group set to root 2016-11-30 13:11:41 -06:00
Erik Johnson
e5ee721696 Don't use simple boolean check on uid/gid 
This breaks setting the user/group to root as its uid/gid is 0.
 2016-11-30 13:10:55 -06:00
Mike Place
b7a39fa680 Merge pull request #37933 from twangboy/win_network_functions 
Add functions from network.py to win_network.py
 2016-11-30 11:29:51 -07:00
Mike Place
6ffea40dee Merge pull request #37813 from twangboy/windows_perms 
Windows Perms for file.directory and file.managed
 2016-11-30 11:12:26 -07:00
Mike Place
0a041277ea Merge pull request #37954 from gtmanfred/2016.11 
use sleep from path for docker.sls_build
 2016-11-30 11:08:44 -07:00
Mike Place
4ef5c98845 Merge pull request #37993 from ticosax/remove-initdb-requirement 
Remove initdb dependency to consume postgres module.
 2016-11-30 11:08:13 -07:00
Erik Johnson
a74fc5bd47 Add expr_form deprecation to Nitrogen release notes 2016-11-30 11:57:40 -06:00
Mike Place
63c9130187 Merge pull request #37999 from cachedout/gem_test_develop 
Fix gem test (develop)
 2016-11-30 10:57:27 -07:00
Mike Place
b158bb6557
Fix gem test (develop) 2016-11-30 10:56:41 -07:00
Ch3LL
f2e5d4e614 add version added 2016-11-30 10:39:25 -07:00
Ch3LL
8c9e9de335 change name 2016-11-30 10:27:37 -07:00
Ch3LL
1d52c18316 add init_delay option for service.dead state module 2016-11-30 10:22:05 -07:00
Mike Place
2e5565685c Merge pull request #37997 from cachedout/gem_test_carbon 
Update gem test for 2016.11
 2016-11-30 10:13:45 -07:00
Mike Place
1d221aa91c
Update gem test for 2016.11 2016-11-30 09:44:56 -07:00
twangboy
ecba55ce61 Fix some more lint 2016-11-30 09:44:51 -07:00