valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
54,547 Commits 24 Branches 182 Tags 341 MiB
7dae045b3c
Commit Graph

54547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Mike Place
c4a796120a Remove overstate system 
Overstate has been on a deprecation path and is scheduled to be removed in Boron. This removes all overstate functionality in favour of orchestrate.
 2015-06-12 13:00:08 -06:00
Thomas S Hatch
95dc331da8 Merge pull request #24614 from skizunov/develop2 
Add support for presence change of a locally connected minion
 2015-06-12 10:25:19 -06:00
Thomas S Hatch
73b1f38288 Merge pull request #24610 from adelcast/dev/adelcast/fix_lsb_grains 
Allow '-' on lsb grains
 2015-06-12 10:24:59 -06:00
Justin Findlay
9f24ec2d8d Merge pull request #24618 from madprog/develop 
Add 'm_state' to 'm_'-prefixed arguments of 'module.run'
 2015-06-11 20:01:01 -06:00
Paul Morelle
8c85a045ea Add prefixable argument `state' for module.run 2015-06-12 02:23:18 +02:00
Paul Morelle
f3bb50c81d Add names of prefixable module arguments in doc 2015-06-12 02:22:22 +02:00
Sergey Kizunov
aca08949a4 Add support for presence change of a locally connected minion 
If a local minion is connected, then: salt.utils.network.local_port_tcp()
will return a set that includes '127.0.0.1'. However, '127.0.0.1' is
excluded from the matching algorithm (rightfully so). So add in the
possible ipv4 addresses that could be used the same way the grains data
that we are trying to match calculates it on the minion, which is using:
salt.utils.network.ip_addrs().

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-06-11 18:02:33 -05:00
Colton Myers
21d9df2831 Merge pull request #24606 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-06-11 16:57:11 -06:00
Nicole Thomas
22c44490b0 Merge pull request #24602 from msteed/py3-fix-ascii-arch 
Undo the memoization of contrived locale
 2015-06-11 13:55:37 -06:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
4eb5bb253b Merge pull request #24605 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-06-11 13:15:21 -06:00
Colton Myers
f96c5029bb Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-11 13:14:37 -06:00
Justin Findlay
8e2599d4c1 Merge pull request #24599 from jacobhammons/24056 
changed 'reload_modules' argument to 'refresh' in sync_modules function
 2015-06-11 12:48:49 -06:00
Alejandro del Castillo
32522c63dd Allow '-' on lsb grains 
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
 2015-06-11 13:42:14 -05:00
Michael Steed
91aeaabb7c undo the memoization of contrived locale 2015-06-11 12:13:07 -06:00
Jacob Hammons
e62a3f1915 changed 'reload_modules' argument to 'refresh' in sync_all function 2015-06-11 11:32:12 -06:00
Thomas S Hatch
e0bb177823 Merge pull request #24598 from jacobhammons/doc-fixes 
2015.5.2 release changes
 2015-06-11 11:24:11 -06:00
Nicole Thomas
bef32b8d1a Merge pull request #24597 from rallytime/slack_doc_example 
Fix doc example test that is failing on develop
 2015-06-11 11:06:48 -06:00
Jacob Hammons
0f840e0be7 changed 'reload_modules' argument to 'refresh' in sync_modules function 
Refs #24056
 2015-06-11 10:33:26 -06:00
Thomas S Hatch
78a6814351 Merge pull request #24549 from jfindlay/shutdown_time 
Shutdown time
 2015-06-11 10:20:55 -06:00
Thomas S Hatch
26930b45bd Merge pull request #24588 from basepi/salt-ssh.orchestrate.20615 
Fixes for saltmod.function for salt-ssh
 2015-06-11 10:15:20 -06:00
Jacob Hammons
f3f34ddff6 2015.5.2 release changes 
Refs #24250
Refs #24457
 2015-06-11 10:01:30 -06:00
Justin Findlay
5a21ad152e Merge pull request #24593 from jayeshka/redismod_states-unit-test 
adding states/redismod unit test case.
 2015-06-11 09:55:27 -06:00
Justin Findlay
2059548c34 Merge pull request #24591 from tbaker57/issue_24494 
Add some documentation surrounding Jinja vs yaml comments -
 2015-06-11 09:54:17 -06:00
Justin Findlay
8ffb86edd0 Merge pull request #24581 from rallytime/disable_some_flaky_tests 
Disabled some flaky tests until we can figure out how to make them more reliable
 2015-06-11 09:51:41 -06:00
Nicole Thomas
d83928a7f9 Merge pull request #24589 from BretFisher/patch-1 
Fixed Mine example for jinja code block
 2015-06-11 09:48:02 -06:00
rallytime
3283a5d21b Fix doc example test that is failing on develop 2015-06-11 09:44:51 -06:00
Mike Place
39ef4f3209 Merge pull request #24584 from cachedout/unit_warnings 
Fix unit test warnings
 2015-06-11 20:47:59 +05:30
Jayesh Kariya
3b95744840 adding states/redismod unit test case. 2015-06-11 17:42:15 +05:30
Tim Baker
a39ecc3b99 Add extra clarification why jinja comments are needed. 2015-06-11 04:07:49 -04:00
Tim Baker
e57cdf5c7f Fix typo 2015-06-11 04:04:21 -04:00
Tim Baker
bbdcc5af01 Add some documentation surrounding Jinja comments - refs #24492, #21217, #23359 2015-06-11 03:42:31 -04:00
Bret Fisher
65a11336dc Fixed Mine example for jinja code block 
In the Mine example, it has the `mine_functions:` deployed via a pillar file, but in the examples `/srv/salt/haproxy_config` snipit for the jinja code block, it used `expr_form='grain'` to access that mine function, which I couldn't get to work, until I changed it to `expr_form='pillar'`. Hopefully this is the right fix.
 2015-06-11 00:50:34 -04:00
Thomas S Hatch
ea57845361 Merge pull request #24582 from kaithar/issue/Fixing-mysql-list_jobs 
Fixing mysql list jobs
 2015-06-10 20:17:03 -06:00
Thomas S Hatch
5ec9d331cf Merge pull request #24124 from ticosax/mine-dockerng 
[dockerng] Migrate salt.mine to dockerng
 2015-06-10 20:15:17 -06:00
Thomas S Hatch
a570d7f967 Merge pull request #24566 from jayeshka/rdp_states-unit-test 
adding states/rdp unit test case.
 2015-06-10 20:14:39 -06:00
Thomas S Hatch
d3feedd174 Merge pull request #24557 from msteed/py3-unittests-4 
More py3 unittest fixes
 2015-06-10 20:14:14 -06:00
Thomas S Hatch
14c22e66f4 Merge pull request #24552 from joejulian/develop_dont_pollute_environment 
Don't pollute the TZ environment variable
 2015-06-10 20:13:21 -06:00
Thomas S Hatch
20ada1f8a1 Merge pull request #24551 from joejulian/2015.5_dont_pollute_environment 
2015.5 dont pollute environment
 2015-06-10 20:13:06 -06:00
Thomas S Hatch
6df201ac71 Merge pull request #24545 from jfindlay/apt_purge 
add purge option to aptpkg.autoremove
 2015-06-10 20:12:23 -06:00
Thomas S Hatch
e637c8467c Merge pull request #24544 from garethgreenaway/pushover_refactor_salt_utils_http 
Converting pushover to use salt.utils.http
 2015-06-10 20:12:12 -06:00
Thomas S Hatch
d87949cfed Merge pull request #24534 from skizunov/develop2 
On Windows, don't use IsUserAnAdmin() because it is deprecated
 2015-06-10 20:11:25 -06:00
Thomas S Hatch
46a87195b0 Merge pull request #24531 from DSRCompany/which_fix 
salt.utils.which() don't lookup outside sys.path
 2015-06-10 20:10:56 -06:00
Thomas S Hatch
5df5fb002e Merge pull request #24519 from dmyerscough/riak-module 
Additional Riak features with error messages printed
 2015-06-10 20:10:29 -06:00
Thomas S Hatch
94067fdc72 Merge pull request #24511 from jquast/rabbitmq-trailing-outp-fix 
bugfix: trailing "...done" in rabbitmq output
 2015-06-10 20:09:23 -06:00
Thomas S Hatch
16ffe20e1e Merge pull request #24316 from kev009/freebsd-disks-grain 
New disks grain
 2015-06-10 20:09:06 -06:00
Colton Myers
826936ce57 Move documentation into docstring instead of comments 2015-06-10 18:59:11 -06:00
Colton Myers
de052e7135 Assign 'return' to 'ret' if necessary in saltmod.function 2015-06-10 18:58:22 -06:00
Colton Myers
34ff989d66 Convert keyword args to key=value strings in salt-ssh 2015-06-10 18:58:08 -06:00