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
77,720 Commits 24 Branches 182 Tags 341 MiB
ee2edda14e
Commit Graph

77720 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
ee2edda14e [PY3] Test comment contents more carefully for list stability 
Stabilizes these tests by avoiding errors when cheese, crackers
order changes in the comment and gives errors like:

-  'comment': 'Kernel modules crackers, cheese are already present',
?                                     --------

+  'comment': 'Kernel modules cheese, crackers are already present',
?                            ++++++++
 2017-02-02 22:34:20 +00:00
Mike Place
b01d99eaa8 Merge pull request #39007 from cloudflare/SALT-EXEC 
New runner function: salt.execute
 2017-01-31 14:02:57 -07:00
Mike Place
1ccb365945 Merge pull request #39002 from rallytime/fix-38111 
Pass win_* options as kwargs when calling file.manage_file
 2017-01-31 13:51:39 -07:00
Mike Place
a249a3490a Merge pull request #39031 from cloudflare/GRAINS-RUNNER 
mine.update runner
 2017-01-31 13:39:11 -07:00
Mike Place
882c5cc889 Merge pull request #39072 from Inveracity/patch-3 
bugfix adding subnetwork option to gce
 2017-01-31 13:38:11 -07:00
Mike Place
2f532ff9f8 Merge pull request #39080 from kraney/boto_lambda_envvar 
Added Lambda environment variables support to boto_lambda modules/states
 2017-01-31 13:20:40 -07:00
Mike Place
8a4d210959 Merge pull request #39079 from gtmanfred/2016.3 
use_keystoneauth should default to False if not specified
 2017-01-31 13:12:46 -07:00
Mike Place
bdaa52ac4e Merge pull request #39043 from twangboy/develop 
SaltTesting fixes for Windows
 2017-01-31 12:27:39 -07:00
Winston Liu
c2d35d181f update botocore dependencies, skip if not met. 2017-01-31 10:49:34 -08:00
Winston Liu
01718e5802 function_present for boto_lambda state module now accepts Lambda Environment Variables. 2017-01-31 10:49:03 -08:00
Mike Place
445a4d025b Additional newline to separate funcs 
Needed for pylint
 2017-01-31 11:30:38 -07:00
Mike Place
fd7911f65b Merge pull request #39073 from sergeizv/grammar-fixes-in-docstrings 
Grammar fixes in docstrings
 2017-01-31 11:25:26 -07:00
Mike Place
fa8053045b Merge pull request #39074 from sergeizv/remove-bad-comment 
Remove bad comment
 2017-01-31 11:23:15 -07:00
Daniel Wallace
bdd142b4eb use_keystoneauth should default to False if not specified 2017-01-31 12:14:40 -06:00
Sergei Zviagintsev
f4bf77a996 Fix test name (#39061) 
Remove an unnecessary underscore character from the name of the
linux_lvm.lvdisplay test:

  test__lvdisplay -> test_lvdisplay
 2017-01-31 10:20:13 -07:00
Inveracity
fc4e51a295 bugfix adding subnetwork option to gce 
Previously when deploying to custom networks salt-cloud would fail with the error described in #31071
Now it is possible to specify a subnetwork in the profile, to deploy to a custom network and a specific subnet in that network.
 2017-01-31 18:08:26 +01:00
Nicole Thomas
73286ac9e7 Merge pull request #39064 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-31 10:07:06 -07:00
Sergei Zviagintsev
7faa13adb3 Remove bad comment 
The comment seems to stay there by mistake as it has no relation to
what's really going on (i.e. checking whether the device is already an
LVM PV). Remove it.
 2017-01-31 17:48:35 +01:00
rallytime
0e5fa1b8ae Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/vsphere.py
 2017-01-31 08:57:44 -07:00
Nicole Thomas
88b171f863 Merge pull request #39048 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-31 08:55:48 -07:00
Sergei Zviagintsev
a5210917fa Grammar fixes in docstrings 
Remove unneeded 'an' articles
 2017-01-31 12:09:02 +01:00
C. R. Oldham
92a542fa21 Add CLI Examples so tests will pass (#39035) 
* Add CLI Examples so tests will pass

* Add CLI Examples so tests will pass
 2017-01-30 17:04:30 -07:00
Winston Liu
dc8344f0c2 updated boto_lambda execution module with 'lambda environment variables' 2017-01-30 16:00:16 -08:00
rallytime
b2b3989773 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/engines/__init__.py
  - salt/loader.py
 2017-01-30 16:58:31 -07:00
Nicole Thomas
a24af5ac46 Merge pull request #39047 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-01-30 16:48:13 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
0943872fab Add 2016.11.3 release notes file (#39044) 2017-01-30 16:43:40 -07:00
Nicole Thomas
7c43f4ac32 [2016.3] Update release numbers for doc build (#39042) 2017-01-30 15:52:33 -07:00
Nicole Thomas
11a99d8be0 [develop] Update release numbers for doc build (#39041) 2017-01-30 15:51:40 -07:00
Nicole Thomas
27081d6520 [2016.11] Update release numbers for doc build (#39040) 2017-01-30 15:51:09 -07:00
Nicole Thomas
424e68436e Update 2016.11.2 release notes (#39039) 2017-01-30 15:40:00 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Shane Lee
86f08c366c Merge pull request #3 from twangboy/win_jenkins 
Fix geteuid stacktrace on Windows
 2017-01-30 15:37:18 -07:00
twangboy
c704eaa175 Fix geteuid stacktrace on Windows 2017-01-30 15:36:08 -07:00
rallytime
43dba1bf78 Skip new managed file state test on Windows 2017-01-30 13:40:25 -07:00
lomeroe
781c15de1c correct issue when running get with return_not_configured=True (#38666) 
lint indentation fixes
 2017-01-30 12:18:14 -07:00
Mike Place
ac0021e506 Merge pull request #38498 from doublescoring/fix-2016.11-38451-develop 
[38451] Fix file.replace to make it suitable to python 3
 2017-01-30 11:22:41 -07:00
Mike Place
5b09dc4198 Merge pull request #39028 from terminalmage/clarify-delimiter-argument 
Clarify delimiter argument
 2017-01-30 11:20:25 -07:00
Mircea Ulinic
691b952b80 mine.update runner 2017-01-30 18:14:50 +00:00
Nicole Thomas
7fa89303a1 Merge pull request #39026 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-30 10:39:18 -07:00
Nicole Thomas
1ff359fa58 Add CLI Example for rest_sample_utils.get_test_string function (#39030) 
Fixes test_valid_doc test that is failing on 2016.11
 2017-01-30 10:34:25 -07:00
C. R. Oldham
f13fb9ef1e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
Julien BONACHERA
1e06f388bb make openvswitch state work with python3 (#38873) 
* openvswitch: add a basic unit test for openvswitch

* openvswitch: enclose comments_* variables into a map

* openvswitch: only prepare error messages if type parameter is present

* openvswitch: add test case: create a GRE port

* openvswitch: remove trailing whitespace

* openvswitch: add missing "comments" variable

* openvswitch: pep8 compliance

* openvswitch: mock dig.check_ip

* openvswitch: rename "type" argument into "tunnel_type"

* openvswitch: reference bridge_exists before assignment

* openvswitch: reference port_list before assignment

* openvswitch: add upgrade note about "type" option renaming
 2017-01-30 09:56:10 -07:00
Mike Place
191a1e55ae Merge pull request #39006 from rallytime/python3-fixes 
Various Python 3 compatibility fixes
 2017-01-30 09:54:28 -07:00
Mircea Ulinic
c26e331588 mine.update only on certain functions (#38874) 
* `mine.update` only on certain functions

* mine.update docstring for mine_functions karg
 2017-01-30 09:44:47 -07:00
Mike Place
b90ffaf1f7 Merge pull request #39019 from terminalmage/fix-broken-runner 
Fix improperly-designed runner
 2017-01-30 09:32:29 -07:00
Mike Place
984e6de244 Merge pull request #39024 from moio/minionswarm-set-machine-id 
minionswarm.py: allow random machine id
 2017-01-30 09:31:15 -07:00