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
78,410 Commits 24 Branches 182 Tags 341 MiB
efa6432d84
Commit Graph

78410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
Erik Johnson
61ff2f3fd8 Add __virtual_aliases__ feature to the loader 
This commit modifies the loader to look for a ``__virtual_aliases__``
attribute when loading a module. If found, it will load the functions
under more than one module namespace in the ``__salt__`` dunder (i.e.
``modname.funcname`` and ``aliasname.funcname``).
 2017-02-09 19:54:01 -06:00
Mike Place
89283e0c04 Merge pull request #39215 from Mrten/patch-1 
remove (?x) modifiers in file.comment regex
 2017-02-09 16:11:12 -07:00
Mike Place
c3c621aab0 Merge pull request #38464 from doublescoring/fix-2016.11-38451 
[38451] Fix file.replace 2016.11
 2017-02-09 16:07:48 -07:00
Mike Place
a80209caf7 Merge pull request #38767 from github-abcde/improve-templating 
template.py: Fix error thrown if default passed to compile_template i…
 2017-02-09 16:05:46 -07:00
Mike Place
a4fcdf3439 Merge pull request #39212 from carlpett/feature/vault-integration 
Merge carlpett/salt-vault
 2017-02-09 16:01:19 -07:00
Mike Place
f16027d30e Merge pull request #39297 from cro/pg_returner_docs 
Add doc to recommend pgjsonb for master job caches
 2017-02-09 15:49:58 -07:00
Mike Place
fc551bcf5d Merge pull request #39293 from sergeizv/grammar-fix 
Grammar fix
 2017-02-09 15:49:10 -07:00
Mike Place
8a1b45632a Merge pull request #39295 from sergeizv/typo-fix 
Fix typo
 2017-02-09 15:48:58 -07:00
Erik Johnson
d3e5d1525e Replace more usage of str.format in the loader 
This performs additional optimizations like the ones done in #39227.
 2017-02-09 16:34:32 -06:00
Mike Place
cfaafece34 Merge pull request #39296 from sergeizv/whitespace-fix 
Whitespace fix in docs Makefile
 2017-02-09 15:26:23 -07:00
Mike Place
0b4dcf4a47 Merge pull request #39294 from sergeizv/fix-link 
Fix link in proxyminion guide
 2017-02-09 15:15:51 -07:00
Mike Place
1d813bd902 Merge pull request #39283 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-09 15:10:03 -07:00
Mike Place
8dff26bd18 Merge pull request #39267 from KaiSforza/nix 
Add nix module to Salt
 2017-02-09 15:08:46 -07:00
rallytime
827906832a Fix up bad merge 2017-02-09 15:06:00 -07:00
C. R. Oldham
28bac649ae Typo 2017-02-09 14:49:45 -07:00
Mike Place
5caa083024 Merge pull request #39250 from Juniper/develop 
junos specific changes to add more feature and enhancements to our APIs
 2017-02-09 14:49:09 -07:00
C. R. Oldham
19fedcdd23 Add doc to recommend pgjsonb for master job caches 2017-02-09 14:46:59 -07:00
twangboy
c63a62d080 Add additional functions to win_iis module 2017-02-09 14:45:55 -07:00
Mike Place
6365211a6f Merge pull request #39291 from terminalmage/pillar-docs 
Add note about using saltenv jinja var in pillar top files
 2017-02-09 14:43:49 -07:00
Mike Place
77e50ed8b7 Merge pull request #39286 from terminalmage/fix-pillarenv-precedence 
Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
 2017-02-09 14:22:45 -07:00
William Giokas
654dbc1341 nix: Correct documentation for gc 
It doesn't actually show a list of all the operations, just the nix
summary.
 2017-02-09 15:02:57 -06:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files 
This adds some useful information to the pillar docs.
 2017-02-09 14:39:09 -06:00
William Giokas
88831d5246 nix: Check for nix-collect-garbage 
I changed this from nix-store to nix-collect-garbage as the
nix.collect_garbage function used to use `nix-store --gc`, but now just
uses nix-collect-garbage.
 2017-02-09 14:20:41 -06:00
William Giokas
5cb25025c9 Add nix module to Salt 
This module adds the ability to work with nix packages, and do some
basic operations on the nix store. There is still some work to be done,
but this lets you orchestrate some basic tasks for a system with nix
installed.
 2017-02-09 14:18:50 -06:00
markuskramerIgitt
c1d193d72e Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-09 20:38:42 +01:00
markuskramerIgitt
ab4ea53d63 jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/8427/violations/file/salt/version.py/ 2017-02-09 19:58:24 +01:00
Sergei Zviagintsev
1d4c1dc140 Whitespace fix in docs Makefile 
Remove extra empty line
 2017-02-09 19:19:09 +01:00
markuskramerIgitt
29153c2f05 https://jenkins.saltstack.com/job/PR/job/salt-pr-lint-n/8407/violations/file/salt/version.py/ 2017-02-09 19:18:44 +01:00
Sergei Zviagintsev
04bde6eed2 Fix link in proxyminion guide 2017-02-09 19:18:13 +01:00
Sergei Zviagintsev
5d9f36d58d Fix typo 
manor -> manner
 2017-02-09 19:16:08 +01:00
Sergei Zviagintsev
70f2b586d3 Rewrap paragraph 
Rewrap the paragraph to fit in 80 chars line. The contents isn't
changed.
 2017-02-09 19:13:01 +01:00
Mike Place
52440416ca Merge pull request #39221 from lvg01/fix-bug-39220 
Fix bug 39220
 2017-02-09 11:12:28 -07:00
Pedro Algarvio
7da366f98a Merge pull request #39285 from s0undt3ch/features/py3 
Features/py3
 2017-02-09 18:08:43 +00:00
Pedro Algarvio
b82bf6bebf
Inform on which python version we are running on 2017-02-09 18:06:30 +00:00
Pedro Algarvio
b264114901
Restore full user permissions when failing to delete 2017-02-09 18:06:27 +00:00
Erik Johnson
3cb9833e57 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar 
Because we check in the master opts first, if the environment or
pillarenv values are set in the master config file, they will take
precedence over the values specified in the minion config (or gathered
via the CLI). This commit fixes that ordering such that the values
passed to __gen_opts() take precedence over the values from the master
config.
 2017-02-09 12:04:11 -06:00
Pedro Algarvio
bef5e66c5b
Use six.moves to import cStringIO 2017-02-09 18:02:40 +00:00
Mike Place
8e028f958c Merge pull request #39272 from daxroc/fix/lsblk_to_blkid 
Refactor blockdev to use blkid instead of lsblk - fixes #39255
 2017-02-09 11:02:34 -07:00
Sergei Zviagintsev
e6ab5178ea Grammar fix 
Use 'if' instead of 'in case'
 2017-02-09 19:02:29 +01:00
Mike Place
a496ec2a16 Merge pull request #39281 from twangboy/win_installer 
Require VCRedist on 2008R2 and below instead of 2008
 2017-02-09 10:59:56 -07:00
Mike Place
eaf8f3faa2 Merge pull request #39278 from mcalmer/dockerng-dryrun-for-sls_build 
Dockerng dryrun for sls build
 2017-02-09 10:54:10 -07:00
Mike Place
49529db00e Merge pull request #39056 from sergeizv/simplify-string-manipulation 
Simplify string manipulation
 2017-02-09 10:50:38 -07:00
Mike Place
8de8ca9110 Remove unused imports 2017-02-09 10:42:07 -07:00
Mike Place
04161b001d Merge pull request #39248 from gtmanfred/develop 
add runas as a global state variable
 2017-02-09 10:36:15 -07:00
Erik Johnson
5a27207c57 Add warning for Dulwich removal (#39280) 
Dulwich support is being removed for the Oxygen release (see #39210).
 2017-02-09 10:33:20 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
 2017-02-09 10:29:40 -07:00
Nicole Thomas
db6140aa83 Merge pull request #39264 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-09 10:10:13 -07:00