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
65,847 Commits 24 Branches 182 Tags 341 MiB
93db6cbddc
Commit Graph

65847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
561157fa89 Allow loading external modules using setuptools entry points 2016-02-17 12:13:13 -07:00
Mike Place
875d9925fa Merge pull request #31183 from heyfife/fix-gce-named-static-ip-reservation 
Fixed named external_ip reservation/re-use code in gce driver.
 2016-02-17 12:02:27 -07:00
Mike Place
e56c402c0c Merge pull request #31032 from terminalmage/issue31001 
(2015.5 branch) yumpkg: ensure that dnf-plugins-core >= 0.1.15 is installed
 2016-02-17 12:02:03 -07:00
Mike Place
6ec92714cb Merge pull request #31173 from twangboy/win_build 
Move build files to salt/pkg/windows
 2016-02-17 11:37:23 -07:00
Justin Anderson
c4e37bac35 Merge pull request #31274 from Ch3LL/branch2016.3 
pkg.latest epoch test for 2016
 2016-02-17 11:15:32 -07:00
rallytime
11cfb636fb Pylint fix 2016-02-17 11:09:07 -07:00
Mike Place
dc2e7c8956 Merge pull request #31253 from gtmanfred/2015.8 
allow for nova servers to be built with premade volumes
 2016-02-17 10:55:39 -07:00
Mike Place
cec69b74f0 Merge pull request #31264 from sjorge/if_missing-155-fix 
fix if_missing gets appended to dirs list, take III
 2016-02-17 10:12:25 -07:00
Mike Place
29e3dd091d Merge pull request #31271 from rallytime/bp-30689 
Back-port #30689 to 2015.8
 2016-02-17 09:52:36 -07:00
Ch3LL
da9bca625e pkg.latest epoch test for 2016 2016-02-17 09:51:11 -07:00
rallytime
023ad4635c Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/modules/win_update.py
  - salt/states/win_update.py
 2016-02-17 09:33:08 -07:00
Jorge Schrauwen
3dae79d516 fix nested grains always show update due to __grains__.get() not supporting the ":" seperator 2016-02-17 08:58:04 -07:00
Michael Calmer
389a4b2548 Check if rpm-python can be imported 2016-02-17 08:49:15 +01:00
Jorge Schrauwen
545edbf5e1 fix if_missing gets appended to dirs list, take III 2016-02-17 07:09:47 +00:00
Jacob Hammons
4640e819c8 Release notes updated 
Updates to doc build template
 2016-02-16 19:54:49 -07:00
Mike Place
fcfc6f4fd3 Merge pull request #31255 from jacobhammons/doc-fixes 
Fixes #30461
 2016-02-16 19:23:46 -07:00
Mike Place
39799fb31b Merge pull request #31244 from rallytime/release-notes-name 
Rename Boron release notes to 2016.3.0
 2016-02-16 19:23:06 -07:00
Erik Johnson
42daea4509 yumpkg.py: Remove repoquery usage everywhere but check_db 2016-02-16 17:47:48 -06:00
Erik Johnson
50befbc149 backport salt.utils.pkg.rpm to 2015.5 2016-02-16 17:24:04 -06:00
Daniel Wallace
36bf06e539 fix doc for boot_volume 2016-02-16 17:22:40 -06:00
jacobhammons
7731e4351d Merge pull request #31254 from jacobhammons/doc-builds 
Support for building docs for next major release
 2016-02-16 15:55:48 -07:00
Jacob Hammons
3c4f8215c3 Fixes #30461 
Credited Sebastian Kramer for finding CVE 2016-1866 in release notes
Added note about salt virt not working on KVM in a VM
 2016-02-16 15:53:35 -07:00
Jacob Hammons
52d7b854d7 Support for building docs for next major release 2016-02-16 15:25:28 -07:00
Daniel Wallace
9660c91b57 allow for nova servers to be built with premade volumes 
if the boot_volume is specified, allow for that to be used instead of an image
 2016-02-16 15:43:51 -06:00
Mike Place
62d76902ce Merge pull request #31189 from dmacvicar/dmacvicar-2015.8-31106 
Fix crash with scheduler and runners (#31106)
 2016-02-16 11:49:36 -07:00
Mike Place
dc78d0a504 Merge pull request #31201 from The-Loeki/patch-1 
Utilize prepared grains var in master-side ipcidr matching
 2016-02-16 11:36:10 -07:00
rallytime
a19f7799e0 Rename Boron release notes to 2016.3.0 2016-02-16 11:16:09 -07:00
Mike Place
52a3c9b0c9 Merge pull request #31130 from ticosax/saltnado_pass_get 
Saltnado: provide also get parameters to the context
 2016-02-16 10:18:52 -07:00
Mike Place
60bbac36fa Merge pull request #31239 from terminalmage/better-bad-load-logging 
Improve logging when master cannot decode a payload
 2016-02-16 09:35:45 -07:00
Mike Place
80f1c3553b Merge pull request #31190 from twangboy/refresh_db 
Clear minion cache before caching from master
 2016-02-16 09:11:26 -07:00
Michael Calmer
6ad6a90955 pylint changes 2016-02-16 16:40:21 +01:00
Erik Johnson
1fbe3cba1f Improve logging when master cannot decode a payload 
This includes the exception type and message in the log message instead
of simply logging "Bad load from minion".
 2016-02-16 09:33:28 -06:00
Mike Place
28a2b8097b Merge pull request #31226 from pprince/PR/docfix/file_tree 
Minor docs fix: file_tree pillar (Fixes #31124)
 2016-02-16 08:25:33 -07:00
Mike Place
9afad13306 Merge pull request #31234 from mcalmer/zypperpy-comment-list_pkgs 
improve doc for list_pkgs
 2016-02-16 08:25:06 -07:00
Mike Place
e8f3a707ae Merge pull request #31237 from mcalmer/zypper_py-add-OEM-product-handling 
add handling for OEM products
 2016-02-16 08:12:20 -07:00
Michael Calmer
d773b7317b add handling for OEM products 2016-02-16 14:44:34 +01:00
Michael Calmer
e3bb862a32 improve doc for list_pkgs 2016-02-16 12:34:26 +01:00
Michael Calmer
7beaf26068 implement version_cmp for zypper 2016-02-16 12:28:52 +01:00
Paul Prince
d592d8636b Fix regression in file_tree pillar (Fixes #31223.) 2016-02-15 14:06:25 -05:00
Paul Prince
c13852fbbf Minor docs fix: file_tree pillar (Fixes #31124) 
Corrected ``keep_newlines`` to ``keep_newline``, and pointed out
that ``keep_newline`` is *not* ignored for binary files, as previously
stated by the documentation.
 2016-02-15 14:05:18 -05:00
Nicolas Delaby
f0a6d2b814 Saltnado provide also get parameters to the context 2016-02-15 10:09:02 +01:00
Ronald van Zantvoort
318689d728 Correct ordering of address/network matching, improve performance of master-side cidr matching 2016-02-14 16:58:28 +01:00
Ronald van Zantvoort
4e4e0926da Utilize prepared grains var in master-side ipcidr matching 
At least partially fixes #29188 et al. (tnx @fantasy88 for analysis)
 2016-02-13 22:42:52 +01:00
Nicole Thomas
415654ee9e Merge pull request #31182 from rallytime/bp-31172 
Back-port #31172 to 2015.8
 2016-02-13 14:36:07 -07:00
Nicole Thomas
434e05667a Merge pull request #31191 from rallytime/fix-27498 
Make sure doc example matches kwarg
 2016-02-13 14:34:57 -07:00
Sergey Kacheev
a7b11024dd fix typo 2016-02-13 23:16:58 +06:00
Sergey Kacheev
92fd48fcf7 Do not Fallback to use lsof if proc available 2016-02-13 22:41:24 +06:00
twangboy
f7a9b09fb6 Move build files to salt/pkg/windows 2016-02-12 21:00:30 -07:00
twangboy
860437665d Fix some lint 2016-02-12 18:34:07 -07:00
rallytime
0bdbaa49d1 Make sure doc example matches kwarg 
Fixes #27498
 2016-02-12 16:58:20 -07:00