valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,145 Commits 24 Branches 182 Tags 341 MiB
bb4ec6c4db
Commit Graph

81145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian McHugh
5fb8190d44 Ensure batch uses passed eauth token or credentials 2017-04-13 10:19:48 -06:00
rallytime
17efc7341c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/version.py
  - tests/unit/states/grains_test.py
  - tests/unit/states/test_archive.py
 2017-04-13 10:14:51 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
5668cc39de Merge pull request #39802 from cachedout/random_startup_delay 
A random startup delay option for minions
 2017-04-13 09:53:06 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-13 09:46:05 -06:00
Mike Place
49d7124fe5 Merge pull request #40598 from mchugh19/batch_eauth 
Ensure batch uses passed eauth token or credentials
 2017-04-13 09:44:45 -06:00
Mike Place
4690633e0f Merge pull request #40659 from gtmanfred/ssh 
encode for py3
 2017-04-13 09:40:59 -06:00
Mike Place
14a5b43216 Merge pull request #40674 from Juniper/nitrogen 
new functions for junos modules (lock, unlock, load, commit_check) and changes to install_config
 2017-04-13 09:36:03 -06:00
rajvidhimar
060974f9b7 Fix doc for junos install_config in state module 2017-04-13 15:35:13 +05:30
rajvidhimar
50a4f94ec0 Add new functions in junos (lock, unlock, load, commit_check) and doc changes 2017-04-13 15:35:13 +05:30
Nicole Thomas
c4d06c8f01 Merge pull request #40647 from The-Loeki/patch-1 
cache roster doc fixes
 2017-04-12 16:33:41 -06:00
Daniel Wallace
bfc34d4825 encode for py3 
Fixes #40434
 2017-04-12 15:32:07 -06:00
Mike Place
d0dc66e40f Merge pull request #40669 from cachedout/fix_develop_lint 
Fix develop lint error
 2017-04-12 15:26:44 -06:00
Mike Place
e387767647
Fix develop lint error 2017-04-12 15:25:57 -06:00
Mike Place
8912cadcbc Remove whitespace 2017-04-12 15:14:56 -06:00
Christian McHugh
ee66c7ca38 re-add batch support to cherrypy saltapi 2017-04-12 22:07:15 +01:00
Mike Place
6df76f6687 Merge pull request #40665 from rallytime/bp-35665 
Back-port #35665 to 2016.11
 2017-04-12 15:06:36 -06:00
Mike Place
3e41a248a5 Merge pull request #40666 from gtmanfred/userdata 
make sure userdata is always defined in ec2
 2017-04-12 15:05:59 -06:00
Daniel Wallace
5e92fd0948 make sure userdata is always defined in ec2 2017-04-12 13:48:49 -06:00
Mike Place
b245abbea5 Merge pull request #40662 from twangboy/backport_msi_versioning 
Backport msi-conformant-version function
 2017-04-12 12:49:22 -06:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868 
Fix four issues in archive.extracted state
 2017-04-12 12:37:51 -06:00
Scott Thrasher
0f897b2426 Switch from comprehension to logic used in jobs runner. This makes it 
easier to deal with potential unicode in returns.
 2017-04-12 12:35:22 -06:00
Scott Thrasher
78dd629f09 Fix compat issues with /jobs return values. 
* ensure that both the return and info keys are lists.
* When the Result key doesn't match the expected shape,
  return an empty list of an empty dict (this matches existing
  behavior when looking for a non-existant JID).
 2017-04-12 12:35:22 -06:00
Scott Thrasher
4778bc7365 Speed up /jobs for salt-api when run under cherrypy. 
Currently, if a jid is supplied, two runners are run (both
jobs.lookup_jid and jobs.list_job). This is unnecessary because
the return from jobs.list_job contains all of the information
from jobs.lookup_jid as well.

This change runs only jobs.list_job in this case and builds an
appropriate return from the output, netting an ~ 40% decrease
in response time for this endpoint when a jid is supplied.
 2017-04-12 12:35:22 -06:00
twangboy
825832812b Backport msi-conformant-version function 2017-04-12 12:00:57 -06:00
Ronald van Zantvoort
4143b050b3 cache roster: better docfixes 2017-04-12 19:46:55 +02:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-12 11:18:32 -06:00
Mike Place
310f1cd146 Merge pull request #40377 from jettero/profile-outputter 
profile outputter
 2017-04-12 11:11:59 -06:00
Christian McHugh
d818137794 pop out of kwargs 2017-04-12 18:09:51 +01:00
Mike Place
0638418d22 Merge pull request #40637 from twangboy/fix_unicode_issues 
Add unicode_literals import
 2017-04-12 10:55:02 -06:00
Nicole Thomas
491661f323 Merge pull request #40651 from twangboy/fix_diskusage_py3 
Fix status.diskusage for Windows on Py3
 2017-04-12 10:21:28 -06:00
Nicole Thomas
3aabd85e53 Merge pull request #40631 from gtmanfred/grains 
if grain is defined as None still convert in append
 2017-04-12 10:19:16 -06:00
Nicole Thomas
b735b8f574 Merge pull request #40603 from kiorky/fix40602 
Fix #40602: onfail_stop: test loop order is broken
 2017-04-12 10:06:55 -06:00
Erik Johnson
a722ca9ccf archive.extracted: also cleanup fileclient's cached location 
When skip_verify is True, salt doesn't refetch a remote file it already
has in its cache. So, if "keep" is set to False, we need to remove it as
well as the location from file.managed.
 2017-04-12 10:16:18 -05:00
Nicole Thomas
8df0450b09 Merge pull request #40650 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-12 09:12:04 -06:00
Paul Miller
9de80643cf I'm not clear on whether you need the backticks if you indent... I imagine you don't 2017-04-12 08:38:49 -04:00
Paul Miller
37b1c92986 better thing to say? 2017-04-12 08:38:05 -04:00
Paul Miller
5e5f00caf3 add example call 2017-04-12 08:37:25 -04:00
Paul Miller
4ff1ea9afa modify to use table_out 2017-04-12 08:34:49 -04:00
Paul Miller
96e1707dd0 facilitate reuse 2017-04-12 08:34:43 -04:00
Christian McHugh
10b53911f5 Create eauth dict for passing into batch class 2017-04-12 06:51:18 +01:00
Daniel Wallace
b0bd99c26d add comment and unit test 2017-04-11 21:08:06 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
Mike Place
5c2be60d7b Space for lint 2017-04-11 16:46:38 -06:00
Mike Place
3737289bee Merge pull request #40629 from aabognah/fix-bug-40167 
Fixing issue # 40167
 2017-04-11 16:45:07 -06:00
twangboy
7c5079ec91 Correct capitalization problem with api call 2017-04-11 16:34:38 -06:00
Mike Place
892d9a5511 Merge pull request #40648 from terminalmage/py3-gitfs-fix 
Fix gitfs' write_file functions for Python 3
 2017-04-11 16:21:33 -06:00
Mike Place
2a22bea290 Merge pull request #40646 from twangboy/fix_win_network 
Keep network.py execution module
 2017-04-11 16:03:01 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-11 15:11:46 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00