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
69,987 Commits 24 Branches 182 Tags 341 MiB
3079d78332
Commit Graph

69987 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3079d78332 Merge pull request #36627 from sjmh/fix/auth_skip_nomatch 
Skip rest of loop on failed func match
 2016-11-11 12:47:12 +13:00
Mike Place
a71e7c77b3 Merge pull request #37600 from mcalmer/fix-timezone-on-SUSE 
change TIMEZONE on SUSE systems (bsc#1008933)
 2016-11-11 10:54:04 +13:00
Mike Place
39b75878cf Merge pull request #37602 from DSRCorporation/bugs/37238_salt_hang_on_master_restart 
Handle master restart in appropriate places using `salt.event` listener.
 2016-11-11 10:53:20 +13:00
Mike Place
019e1a721b Merge pull request #37608 from gtmanfred/2016.3 
allow multiline returns from docker for mac
 2016-11-11 10:48:59 +13:00
Erik Johnson
71032f8da5 Documentation improvements and corrections (#37604) 
An earlier change (178ff08) introduced inaccurate information into the
documentation. This commit corrects that inaccuracy. It also adds some
clarifications to which SSH URL formats are supported, clarification
that the ``branch`` parameter refers to the local branch, and that
``user`` refers to the system user and not the http(s)/ssh auth user.
Lastly, some cleanup of improper RST formatting has been done.
 2016-11-10 14:12:48 -07:00
Daniel Wallace
74aee1e372 allow multiline returns from docker for mac 
Nothing actually specifies the number of lines the docker api returns,
so we need to allow for more than one line to be returned which this
specfic docker returner does
 2016-11-10 13:08:44 -06:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Dmitry Kuzmenko
d3d987b19c Handle master restart in appropriate places using salt.event listener. 2016-11-10 18:07:09 +03:00
Michael Calmer
3530b542f0 change TIMEZONE on SUSE systems (bsc#1008933) 2016-11-10 11:00:50 +01:00
Mike Place
fdd13b4145 Merge pull request #37540 from yhekma/2016.3 
Added prefix to tempfile for template
 2016-11-10 13:37:17 +13:00
Clint Armstrong
5e80accd82 Update for m2crypto changes removing lhash (#37578) 
* Update for m2crypto changes removing lhash

* linting issues
 2016-11-09 13:47:26 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
Erik Johnson
2810b85cac Add a test to ensure we don't check for fast-forward before fetching (#37571) 2016-11-09 12:43:25 -07:00
Mike Place
b01c247ea9 Merge pull request #37553 from rallytime/bp-37521 
Back-port #37521 to 2016.3
 2016-11-09 12:11:07 +13:00
Mike Place
694df30d40 Merge pull request #37565 from rallytime/bp-37549 
Back-port #37549 to 2016.3
 2016-11-09 12:10:25 +13:00
Erik Johnson
2fc0b222bc Fix regression in service.dead state (#37562) 
* Fix regression in service.dead state when service is not available

This was originally broken in c4f899b.

* Add unit test for issue 37511
 2016-11-08 14:58:33 -07:00
Seth House
ac754dbac5 Skip config type checking for sdb values (#37560) 2016-11-08 14:57:47 -07:00
Mrten
c92a90b8e5 Update sqlite3.py 
change boron to 2016.3.0. as requested
 2016-11-08 14:11:00 -07:00
Mrten
fb76557a2a sqlite is not found in 2015.8 
first appearance is boron
 2016-11-08 14:10:59 -07:00
Nicole Thomas
453319b50a Don't pass the vpc id to boto.vpc.create_internet_gateway func (#37556) 
That function's namespace looks like this:
```
def create_internet_gateway(self, dry_run=False):
```
So when we pass in the vpc_id opbject in the test, the check later
in the function sets `dry_run=True` since the vpc_id opbject exists.

This later throws JSONResponseErrors because the `DryRun` flag is
set. This error raising functionality was added in the most recent
version of moto, which exposed this bug.

This fixes the three boto_vpc_test unit state tests. We'll see if
other tests need to be addressed in other files on a full test run.
 2016-11-08 12:48:26 -07:00
Alexey Genus
30f92b05f4 refresh_pillar() should be called always 2016-11-08 09:57:35 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
Yoram Hekma
93a59f8034 Added prefix to tempfile for template 
__clean_tmp() only cleans files that have salt.utils.files.TEMPFILE_PREFIX as a prefix, which the jinja rendering didn't set. This causes the /tmp directory to fill up more with each salt run.
 2016-11-08 10:48:26 +01:00
Mike Place
96b8b9a849 Merge pull request #37457 from rallytime/fix-31081 
Fixup file.line docs to be more clear and consistent
 2016-11-08 13:29:20 +13:00
Mike Place
7de790ffed Merge pull request #37526 from twangboy/fix_35799 
Remove loop from dsc.apply_config
 2016-11-08 13:23:11 +13:00
Mike Place
94811df2ea Merge pull request #37534 from rallytime/bp-merge-foward-fix 
Back-port fix needed from #37515
 2016-11-08 13:14:46 +13:00
Mike Place
17adbb0c9f Merge pull request #37533 from whiteinge/salt-api-504-timeouts 
Return a 504 response instead of 500 for Salt timeouts
 2016-11-08 13:14:15 +13:00
Mike Place
a9f03eee6f Merge pull request #37529 from lorengordon/bp-36736 
Backport: PR 36736 to 2016.3
 2016-11-08 13:04:10 +13:00
Erik Johnson
d1b2af1d69 Add missing source_hash_name args to a couple funcs 
file.check_managed and file.check_managed_changes both were missing this
new argument. This commit adds it in all places where these functions
are used.
 2016-11-07 16:26:25 -07:00
Seth House
63226aeda6 Return a 504 response instead of 500 for Salt timeouts 2016-11-07 16:23:17 -07:00
Mike Place
19475aada6 Merge pull request #37519 from rallytime/returner-load-errors 
Update returner __virtual__() return messages for loader
 2016-11-08 12:06:22 +13:00
Mike Place
fefdfab850 Merge pull request #37527 from rallytime/fix-35016 
Add syndic_id=None kwarg to save_minions funcs in returners
 2016-11-08 12:04:03 +13:00
twangboy
fc4260911c Remove unnecessary format 2016-11-07 15:38:07 -07:00
Daniel Wallace
b77b6bae02 fix Lithium to 2015.5.0 (#37530) 2016-11-07 15:35:48 -07:00
m03
21c2664b6a Fix issue 36679 win_servermanager failure 2016-11-07 17:21:23 -05:00
rallytime
2944b244aa Add syndic_id=None kwarg to save_minions funcs in returners 
Fixes #35016
 2016-11-07 14:26:01 -07:00
twangboy
c934a2bfa7 Remove the loop from apply_config 2016-11-07 14:10:09 -07:00
rallytime
25821bb8db Clarify which modes use "before", "after", and "indent" options 
This clarification was added both the the file.line module and
file.line state docs.
 2016-11-07 12:19:29 -07:00
Nicole Thomas
743164844d Merge pull request #37514 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-07 09:51:06 -07:00
rallytime
fb261a31f3 Update returner __virtual__() return messages for loader 
Refs #37444 and #37502
 2016-11-07 09:15:44 -07:00
rallytime
41166aede4 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-11-07 08:11:56 -07:00
Mike Place
2d924d0820 Merge pull request #37503 from cachedout/issue_36713 
Catch loader error on returners without save_load
 2016-11-07 22:33:57 +13:00
Mike Place
d95bf59f97 Merge pull request #37499 from cachedout/key_docs_clarify 
Clarify docs on salt-key events
 2016-11-07 22:33:20 +13:00
Mike Place
1dd1408ae6 Merge pull request #37500 from cachedout/remove_include_errors 
Remove unused flag
 2016-11-07 22:33:04 +13:00
Mike Place
4b6f1ab1c4 Merge pull request #37502 from cachedout/issue_37444 
Log proper message on returners that cannot be loaded
 2016-11-07 22:32:45 +13:00
Mike Place
5f7f971b2c
Catch loader error on returners without save_load 
Refs #36713
 2016-11-07 14:51:31 +13:00
Mike Place
4c5ab057ce
Remove debugging 2016-11-07 14:03:44 +13:00
Mike Place
17d01e4f4c
Log proper message on returners that cannot be loaded 
Closes #37444
 2016-11-07 14:01:46 +13:00
Mike Place
6c705b11e0
Remove unused flag 
The 'include_errors' option does nothing and has been removed.
 2016-11-07 13:20:34 +13:00
Mike Place
2758e74785
Clarify docs on salt-key events 
Closes #37448
 2016-11-07 13:03:40 +13:00