Commit Graph

78184 Commits

Author SHA1 Message Date
rajvidhimar
d073eec7e4 Bug fixes in facts_refresh and rpc 2017-01-31 12:41:57 +05:30
Nitin Kumar
a4da1095b3 Merge pull request #5 from nembery/develop
Use salt template system for multiple backend support, avoid commit with no diff
2017-01-31 12:12:19 +05:30
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
Mircea Ulinic
f31bcba082 Fix typos 2017-01-30 18:22:12 +00: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
Nathan Embery
f1bbc294df avoid commits if config already applied, use salt template system, small bugfix for junos <14.2 2017-01-30 11:42:39 -05: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
Nicole Thomas
c95d1e5a31 Some small spelling fixes for vault docs (#39029)
Refs #39001
2017-01-30 09:30:48 -07:00
Mike Place
80e4aa2ea2 Merge pull request #39022 from moio/minionswarm-reuse-existing-data
minionswarm.py: allow temporary data reuse
2017-01-30 09:29:30 -07:00
Daniel Mota Leite
27d173f318 salt: update vault documentation to better explain how to use it (#39001) 2017-01-30 09:25:00 -07:00
Mike Place
5b0ed18df6 Merge pull request #39023 from moio/minionswarm-predictable-random
minionswarm.py: use predictable random numbers
2017-01-30 09:24:40 -07:00
Mircea Ulinic
570adea118 Redis cache doc 2017-01-30 16:24:04 +00:00
Mircea Ulinic
6b0d90a27d Redis plugin for the caching sub-system 2017-01-30 16:23:59 +00:00
C. R. Oldham
a7fc02e196 Ungate the status.py module and raise unsupported errors in functions not executeable on Windows. (#39005) 2017-01-30 09:21:12 -07:00
Erik Johnson
f29ef071f3 Clarify delimiter argument
This makes the usage of the delimiter argument in pillar.get/grains.get
more clear.
2017-01-30 10:15:48 -06:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/pillar/__init__.py
2017-01-30 09:06:27 -07:00
Silvio Moioli
f454dbd84c minionswarm.py: use predictable random numbers 2017-01-30 16:34:01 +01:00
Nathan Embery
05db0c963c merge back to upstream 2017-01-30 10:03:14 -05:00
Silvio Moioli
f27e0e8f4e minionswarm.py: allow random machine id 2017-01-30 14:21:52 +01:00
rajvidhimar
64666667bc Fix install_config 2017-01-30 18:03:28 +05:30
Silvio Moioli
382cf21b5f minionswarm.py: allow re-use of temporary files 2017-01-30 13:23:45 +01:00
Silvio Moioli
b2f7d3e3cf minionswarm.py: add option to specify temp dir 2017-01-30 13:23:45 +01:00
Erik Johnson
15b4087fee Fix improperly-designed runner
This runner tries to kill the Salt process if it cannot load the
3rd-party Python module on which it relies. This is unacceptable.

This commit modifies the runner by adding a __virtual__ function and
providing a graceful failure condition for the loader.

It also makes some coding style guideline fixes.
2017-01-30 01:51:54 -06:00
Mircea Ulinic
4602e78307 New runner function: salt.execute 2017-01-28 20:47:43 +00:00