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

76523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dharper
e2a232921d Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-03-06 09:09:03 -07:00
Dennis Harper
838774291d Update __init__.py 2017-03-06 09:09:03 -07:00
dharper
ff6f63e9dd Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-03-06 09:09:03 -07:00
dharper
855f87554c Checking instance exists in master._get_cached_minion_data when cache.fetch returns None 2017-03-06 09:08:31 -07:00
cDR
6539dbdbca Do not use name resolving for --notrim check 
This causes a significant delay on servers with many open connections
 2017-03-06 09:06:20 -07:00
Erik Johnson
0285ff3c7d Fix regression in archive.extracted when it runs file.directory 
This is similar to the change made in 28651a6, we no longer need this
code since we're invoking the state function directly instead of via the
state compiler.
 2017-03-04 23:14:18 -06:00
Mike Place
f223fa8906 Merge pull request #39794 from cachedout/clean_monitor_socket_shutdown 
Clean up errors which might be thrown when the monitor socket shuts down
 2017-03-04 09:12:37 -07:00
Mike Place
4002dc1947 Merge pull request #39819 from terminalmage/top-file-matching-docs 
Improve the Top File matching docs
 2017-03-04 09:06:39 -07:00
Mike Place
c08aaeb7fd Merge pull request #39820 from ni3mm4nd/beacons_topic_doc_typo 
Add missing apostrophe in Beacons topic documentation
 2017-03-04 09:05:28 -07:00
Mike Place
cbd2a4e3cc Merge pull request #39826 from cachedout/yubikey_fix 
Add group func to yubikey auth
 2017-03-04 09:02:13 -07:00
Mike Place
6125eff02d
Add group func to yubikey auth 
Because we don't support groups with yubikeys (and can't, in fact)
we need to dummy up this to always return false. This allows individual
user auths to work, whereas they would fail prior to this change.
 2017-03-03 16:46:24 -07:00
Jan Kadlec
804b12048c Add missing apostrophe 2017-03-03 17:58:53 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs 
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
 2017-03-03 10:40:22 -06:00
Mike Place
f575ef459f Merge pull request #39624 from drawsmcgraw/39622 
Address issue 39622
 2017-03-03 08:59:03 -07:00
Mike Place
d0440e2a2a Merge pull request #39799 from Ch3LL/fix_salt_key_msg 
Fix deleteed message when key is deleted
 2017-03-02 22:17:40 -07:00
Pedro Algarvio
1f3619c1e5 Merge pull request #39796 from cachedout/master_shutdown 
Stop the process manager when it no longer has processes to manage
 2017-03-02 23:03:12 +00:00
Ch3LL
8346682cf7 Fix deleteed message when key is deleted 2017-03-02 15:24:40 -07:00
Mike Place
e31d46c1b8
Stop the process manager when it no longer has processes to manage 2017-03-02 14:45:57 -07:00
Mike Place
2e683e788b
Clean up errors which might be thrown when the monitor socket shuts down 2017-03-02 13:27:32 -07:00
Mike Place
53341cf152 Merge pull request #39791 from gtmanfred/2016.3 
load runners if role is master
 2017-03-02 12:43:41 -07:00
Daniel Wallace
3ab4f843bf load runners if role is master 2017-03-02 12:05:52 -06:00
Mike Place
9f70ad7164 Merge pull request #39472 from whiteinge/_reformat_low-update 
Update _reformat_low to not run kwarg dicts through parse_input
 2017-03-02 10:46:19 -07:00
Mike Place
7dfc4b572a Merge pull request #39727 from terminalmage/issue39627 
salt.modules.state: check gathered pillar for errors instead of in-memory pillar
 2017-03-02 10:06:42 -07:00
C. R. Oldham
965f474316 Merge pull request #39776 from cloudflare/proxy-schedule 
WIP: Save _schedule.conf under <proxy ID> dir
 2017-03-02 09:27:44 -07:00
Mike Place
555f1473f6 Merge pull request #39788 from cachedout/disable_api_test 
Disable one API test that is flaky
 2017-03-02 09:17:31 -07:00
Mike Place
523e377b33
Disable one API test that is flaky 2017-03-02 09:16:43 -07:00
Mike Place
c234c25092 Merge pull request #39784 from sergeizv/fix-39782 
Fix 39782
 2017-03-02 09:08:50 -07:00
Sergei Zviagintsev
b71c3fe13c Revert "cloud.clouds.ec2: cache each named node (#33164)" 
This reverts commit b3805d825a ("cloud.clouds.ec2: cache each named
node (#33164)").

Commit 25771fc030 ("_get_node return instance info directly, not a
dict of instances") from 2016.3 feature release changed how the result
of _get_node should be interpreted. Before it was like

  res = _get_node(...)
  node = res[name]

and after the commit it became

  node = _get_node(...)

Commit b3805d825a ("cloud.clouds.ec2: cache each named node (#33164)")
submitted into 2015.8 as a bugfix for #33162 added loops over the keys
of a dictionary returned by _get_node, fixing
salt.utils.cloud.cache_node calls in queue_instances() and
show_instance().

But after being merged into 2016.3 with merge commit 679200aeb2
("Merge branch '2015.8' into '2016.3'"), the commit in question
reintroduced the bug on 2016.3 because of changed return value of
_get_node.

Fixes #39782
 2017-03-02 12:42:24 +01:00
Mircea Ulinic
35b8b8fd64 Save _schedule.conf under <minion ID> dir 
So each proxy can have its own scheduled functions, independently.
 2017-03-02 04:12:40 +00:00
Mike Place
793979cbe6 Merge pull request #39762 from terminalmage/issue39751 
Fix regression in file.get_managed
 2017-03-01 19:59:33 -07:00
Mike Place
4ee59be22c Merge pull request #39766 from rallytime/fix-ipv6-connection 
Restore ipv6 connectivity and "master: <ip>:<port>" support
 2017-03-01 19:55:54 -07:00
Mike Place
91a9337ab3 Merge pull request #39767 from rallytime/bp-38316 
Back-port #38316 to 2016.11
 2017-03-01 19:54:57 -07:00
Mike Place
4a01bd64ea Merge pull request #39768 from rallytime/bp-39719 
Back-port #39719 to 2016.11
 2017-03-01 19:54:39 -07:00
rallytime
776a9431b9 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/minion.py
 2017-03-01 16:07:14 -07:00
Sébastien Coavoux
d7cb70f203 Enh: Support new version of tuned-adm binary 
Fixes #39692
 2017-03-01 15:16:10 -07:00
Michael Alphonso
1dcf018df7 requests api says Response.encoding can sometimes be None http://docs.python-requests.org/en/master/api/#requests.Response.encoding and result.text.encode() doesn't accept None and expects a string. 
this change prevents wrong-type runtime exceptions and defaults the encoding back to 'utf-8' (the default prior to PR#37912
 2017-03-01 15:14:03 -07:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -07:00
Mike Place
780457f934 Merge pull request #39760 from Ch3LL/2016.11.4_notes 
Initial 2016.11.4 Release Notes Doc
 2017-03-01 11:43:39 -07:00
Mike Place
a24da31131 Merge pull request #39761 from cachedout/issue_33187 
Properly display error in jboss7 state
 2017-03-01 11:43:22 -07:00
Erik Johnson
3bb0ebd872 Update tests for PR 39727 
Also reduce the complexity of some of the mocking by adding the cachedir
to the global state.__opts__.
 2017-03-01 12:10:28 -06:00
Erik Johnson
64db0b8563 Add integration tests for remote file sources 2017-03-01 10:57:06 -06:00
Erik Johnson
f9f894d981 Fix regression in file.get_managed when skip_verify=True 2017-03-01 10:56:19 -06:00
Ch3LL
1853c998c4 add initial 2016.11.4 release notes 2017-03-01 09:47:07 -07:00
Mike Place
c2df29edb2
Properly display error in jboss7 state 
Refs #33187
 2017-03-01 09:27:07 -07:00
Erik Johnson
28651a6699 Remove next(iter()) extraction 
This is no longer needed since we're invoking the state module directly
and not via the state compiler.
 2017-03-01 10:19:33 -06:00
Mike Place
0147f78ab5 Merge pull request #39731 from twangboy/win_pkg_docs 
Add docs for Kwargs in pkg.refresh_db
 2017-02-28 15:02:58 -07:00
Mike Place
fce2d184f3 Merge pull request #39734 from garethgreenaway/39710_missing_schedule_add_parameter 
Missing parameter in the schedule.add function
 2017-02-28 13:43:07 -07:00
Gareth J. Greenaway
63eb610245 Per #39710, missing parameter in the schedule.add function 2017-02-28 11:18:11 -08:00
twangboy
423e6f7448 Add docs for Kwargs in pkg.refresh_db 2017-02-28 11:48:56 -07:00
Nicole Thomas
7b4865c058 Merge pull request #39729 from rallytime/update-release-ver-2016.11 
[2016.11] Bump latest release version to 2016.11.3
 2017-02-28 11:08:25 -07:00