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
80,844 Commits 24 Branches 182 Tags 341 MiB
5282ea2480
Commit Graph

80844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Erik Johnson
e50dba7bf4 Fix gitfs' write_file functions for Python 3 
In PY3 both GitPython and Pygit2 expect the file to be opened in binary
write mode, as they write bytes and not strings.
 2017-04-11 16:01:20 -05:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
Nicole Thomas
e1f5a5dfc3 Merge pull request #40645 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-11 14:59:13 -06:00
Ronald van Zantvoort
43277b2a8d cache roster doc fixes 2017-04-11 22:59:11 +02:00
Nicole Thomas
5699b3bfc7 Merge pull request #40636 from terminalmage/fix-pillar-logging-regression 
Fix regression in merge conflict resolution
 2017-04-11 14:59:01 -06:00
Nicole Thomas
cef13c11ca Merge pull request #40611 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-11 14:58:03 -06:00
Mike Place
6c4ae3c914 Merge pull request #40642 from DSRCorporation/bugs/40594_ssh_cachedir 
Correctly resolve relative cache path to absolute.
 2017-04-11 14:43:57 -06:00
rallytime
8de6497933 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-11 13:41:07 -06:00
Nicole Thomas
2ae9eaa176 Merge pull request #40638 from rallytime/bp-40571 
Back-port #40571 to 2016.3
 2017-04-11 13:36:53 -06:00
rallytime
cd0adb82d6 Spelling fix 2017-04-11 13:35:38 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Mike Place
8492cef7a5 Merge pull request #40609 from gtmanfred/2016.11 
stat_file when keep is set, instead of mirroring all file permissions
 2017-04-11 12:48:47 -06:00
rallytime
36f7a6481b Remove blacklisted loader usage of dunder variables 2017-04-11 12:16:15 -06:00
Dmitry Kuzmenko
055256c518 Correctly resolve relative cache path to absolute. 2017-04-11 21:15:29 +03:00
Erik Johnson
20f856f038 Update unit tests for numeric osmajorrelease 2017-04-11 12:36:36 -05:00
Erik Johnson
2d1c4be2df pkgrepo.managed: properly handle comments for debian 
Resolves #39778.
 2017-04-11 11:03:32 -06:00
Erik Johnson
23a6c924bd Fix regression in merge conflict resolution 
See a781a0d0d1 (commitcomment-21715967)
 2017-04-11 11:26:46 -05:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes 
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
 2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes 
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
 2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease 
This is a typo fix
 2017-04-11 11:02:58 -05:00
Erik Johnson
8b41b80b17 Force osmajorrelease grain to be an int 
This is a scheduled change for Nitrogen that we missed before branching.
 2017-04-11 11:02:58 -05:00