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
67,820 Commits 24 Branches 182 Tags 341 MiB
5518e1dd14
Commit Graph

67820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
5518e1dd14 Fix whitespace 2016-06-03 14:48:26 -06:00
Mike Place
7b50e1766e Better fix 
Just use opts grains int he loader and fall back to empty dict
 2016-06-03 13:49:51 -06:00
Mike Place
4e18ff7000 Restore grains context to renderers 
We were missing the proper grains dictionary in the renderer context. This restores it.

Closes #33614
 2016-05-31 14:53:32 -06:00
Nicole Thomas
b379dc57fd Merge pull request #33637 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-31 14:43:17 -04:00
rallytime
cd05d2bed1 Fix zypper test 2016-05-31 13:43:09 -04:00
Nicole Thomas
b7230bded7 Back-port #33613 to 2016.3 (#33638) 
* Updated apache_module for backward compatible.

[This](f3a2b27671) introduced
a change of functions names that break this module when using Beryllium or older and upgrading to Boron.
Added here a deprecated warning in to order to advice users to migrate to new functions names. Also
documentation updated since was not updated in the original commit.

* Move warnutil from Carbon to Nitrogen

Let's give people a little more time to update their states.
 2016-05-31 13:14:23 -04:00
Mike Place
23506f8279 Merge pull request #33606 from danslimmon/ini-optionsabsent-33590 
Fixed ini.options_absent. Resolves #33590.
 2016-05-31 08:51:35 -07:00
Mike Place
44e8c9e720 Merge pull request #33604 from kev009/fix-33578 
Fix #33578 disks grain
 2016-05-31 08:17:36 -07:00
Wolodja Wentland
259529e25d Use correct state name in libvirt formula doc (#33631) 
The state module for libvirt has been renamed to 'virt' from
'libvirt' in 2016.3 and these references to the old name have not been
updated.
 2016-05-31 11:09:25 -04:00
Nicole Thomas
74a7b78e00 Merge branch '2015.8' into '2016.3' 
Conflicts:
  -   -   -   -   -   -   -   -   - doc/conf.py
 2016-05-31 11:02:20 -04:00
Dan Slimmon
fb13852102 Fixed ini.options_absent. Resolves #33590. 2016-05-29 03:00:47 +00:00
Mike Place
e9a0c9304a Merge pull request #33603 from sjorge/2016.3-smartos-esky 
allow esky packages to be build on base64 2015Q4
 2016-05-28 17:36:02 -07:00
Kevin Bowling
e452ec514e Ignore cdroms in disks grain 2016-05-28 13:19:51 -07:00
Kevin Bowling
8bf0290024 Make disks grain datatyper more resilient 2016-05-28 13:06:25 -07:00
Jorge Schrauwen
1064102394 add no-wheel, instructions were failing for someone testing due to wheel being used nog producing an egg 2016-05-28 19:00:42 +02:00
Jorge Schrauwen
c85e03ecf7 allow for newer pyzmq in esky packages 2016-05-28 16:08:04 +00:00
Jorge Schrauwen
1620b8c0fa allow esky packages to be build on base64 2015Q4 2016-05-28 13:59:14 +00:00
Mike Place
b47182e47c Merge pull request #33558 from twangboy/fix_win_servermanager 
Fix win servermanager
 2016-05-27 15:05:43 -07:00
twangboy
62a6bde0ea Fix comment when already installed 2016-05-27 11:33:52 -06:00
twangboy
79bc7195dc Fix unit tests 2016-05-27 11:33:52 -06:00
twangboy
56a6f6bb83 Fix changes 2016-05-27 11:33:52 -06:00
twangboy
8ebe99ec5e Fix restart_needed 2016-05-27 11:33:52 -06:00
twangboy
6e478cbda0 Add restart needed 2016-05-27 11:33:52 -06:00
twangboy
72ebf26616 Add missing import 2016-05-27 11:33:52 -06:00
twangboy
193583be96 Use dictionary compare for changes in remove 2016-05-27 11:33:52 -06:00
twangboy
1ae7dd76c1 Use dictionary compare for changes 2016-05-27 11:33:52 -06:00
Mike Place
afd3c1b9bd Merge pull request #33576 from rodacom/2016.3 
Fix #33565 (typo causes invalid syntax)
 2016-05-27 09:46:34 -07:00
Tom LAREDO
9f7d81e0cc Fix #33565 2016-05-27 13:18:38 +02:00
Mike Place
71145ddda7 Merge pull request #33549 from thatch45/33530 
Fix for #33530
 2016-05-26 12:26:00 -07:00
Mike Place
58d89d66e3 Merge pull request #33555 from cachedout/issue_33544 
Fix crashing Maintenence process
 2016-05-26 12:25:39 -07:00
Mike Place
4831c6a353 Merge pull request #33538 from alprs/fix-cmd_user_runas_deprecation_bug 
Fix a KeyError if group is provided but not user in cmd states
 2016-05-26 10:58:05 -07:00
Mike Place
5287a1b8c8 Merge pull request #33550 from saltstack/jacobhammons-patch-1 
Fixes display of thorium docs
 2016-05-26 10:57:05 -07:00
Mike Place
fe7ee7a470 Fix crashing Maintenence process 
The first time through the loop we deleted the dir and then stack
traced the second time through the loop if we hit the other conditional.

Resolves #33544
 2016-05-26 11:14:56 -06:00
jacobhammons
65df3a6fa2 Refs #33543 2016-05-26 09:58:42 -06:00
Thomas S Hatch
b906859fce Fix for #33530 2016-05-26 09:22:44 -06:00
Mike Place
3a95f8a977 Merge pull request #33509 from twangboy/fix_arch 
Detect System Architecture for Mac Build
 2016-05-26 07:40:54 -07:00
Mike Place
d052908729 Merge pull request #33501 from meaksh/zypper-download-check-signature-2015.8 
unit tests for rpm.checksum() and zypper.download()
 2016-05-26 07:34:27 -07:00
Mike Place
e2d0c4abb1 Merge pull request #33513 from rallytime/fix-33319 
Add a section to the jinja docs about escaping jinja
 2016-05-26 07:24:58 -07:00
Mike Place
0bc881b4da Merge pull request #33522 from jfindlay/mac_pkg 
rework modules.mac_brew.latest_version to work around brew version inconsistency
 2016-05-26 07:19:25 -07:00
Mike Place
fabc15e616 Merge pull request #33520 from jacobhammons/release-notes.8 
Updated version numbers in the docs for the 2016.3.0 release
 2016-05-26 07:15:00 -07:00
Mike Place
518713f5e5 Merge pull request #33519 from jacobhammons/2016.3.0rel 
New doc site layout, 2016.3.0 release note known issue additions
 2016-05-26 06:53:21 -07:00
Andreas Lutro
c738a0de76 fix a KeyError if group is provided but not user 2016-05-26 15:10:05 +02:00
Pablo Suárez Hernández
eaaef25c79 lint issue fixed 2016-05-26 08:26:24 +01:00
Justin Findlay
2781377b17 modules.mac_brew: update unit tests 2016-05-25 22:15:12 -06:00
Justin Findlay
0ed3598fc9 modules.mac_brew int tests: add latest_version test 2016-05-25 22:15:12 -06:00
Justin Findlay
8789c2d06d modules.mac_brew int tests: add list_upgrades,info_installed 2016-05-25 22:05:01 -06:00
Justin Findlay
be381e0fc9 modules.mac_brew int tests: move decorators to class 
Also remove unneeded system grains code.
 2016-05-25 22:05:01 -06:00
Justin Findlay
fa3ec8a2bf modules.mac_brew.latest_version: refactor to use standard methods 
Also fix an error in the `pkg.latest` state function caused by a
difference in how brew reports versions for uninstalled vs installed
packages.
 2016-05-25 22:05:01 -06:00
Justin Findlay
58492c29cf modules.mac_brew: add info_installed function 2016-05-25 22:05:01 -06:00
Justin Findlay
9abf8f4832 modules.mac_brew.list_upgrades: use brew's json output 2016-05-25 22:05:01 -06:00