Pedro Algarvio
f041653746
Handle SPM paths in the setup script
2015-08-28 01:22:14 +01:00
Colton Myers
d97d4ceafc
Merge pull request #26717 from basepi/revert.loader.changes.26645
...
[2015.8] Revert loader changes from #26645
2015-08-27 15:28:20 -06:00
Pedro Algarvio
ab4e708112
Merge pull request #26712 from techhat/spmroots
...
Move SPM paths around
2015-08-27 21:51:44 +01:00
Colton Myers
6f5a9f0e87
Merge pull request #26680 from TheBigBear/patch-1
...
add more python libs info in '--versions-report'
2015-08-27 14:45:53 -06:00
Pedro Algarvio
74315ded25
Merge pull request #26716 from terminalmage/issue26713
...
Allow git identity to be a list
2015-08-27 21:37:37 +01:00
Colton Myers
52029e302e
Add back in manual load of grains/minion_mods to sentry handler
2015-08-27 13:56:39 -06:00
Erik Johnson
4c01312f26
Fix missing import
2015-08-27 14:51:26 -05:00
Erik Johnson
6fbd461029
Allow git identity to be a list
...
Also make some fixes with regards to checking remote refs and
hard-resets.
Fixes #26713 .
2015-08-27 14:51:04 -05:00
Colton Myers
f3a7d91457
Revert "Make __grains__ and __salt__ available for log_handler modules"
...
This reverts commit a4a3f7ff81
2015-08-27 13:40:33 -06:00
Mike Place
7ce05a81ff
Merge pull request #26691 from garethgreenaway/2015_8_fixes_ipset_module
...
Fixes to ipset module for 2015.8
2015-08-27 13:34:08 -06:00
Joseph Hall
f4723efe68
Add SPM paths into mainline Salt configs
2015-08-27 12:21:53 -06:00
Justin Findlay
c28dac130d
Merge pull request #26701 from kev009/2015.8
...
Ignore the first element of kern.disks split, which is the sysctl name (new disks grain)
2015-08-27 11:48:58 -06:00
Joseph Hall
dccf29bea2
Move SPM paths around
2015-08-27 10:30:51 -06:00
Colton Myers
034c39df2e
Merge pull request #26678 from terminalmage/issue13550
...
Restructure git.latest rewrite to work better when following HEAD
2015-08-27 10:13:33 -06:00
Gareth J. Greenaway
c11cf22abe
fixing ipset unit tests based on changes. Adding additional tests for when ip set type is hash:net
2015-08-27 08:28:23 -07:00
Kevin Bowling
8763d5dbca
Ignore the first element of kern.disks split, which is the sysctl name
2015-08-27 02:15:26 -07:00
Erik Johnson
8b58132393
Support non-annotated tags
2015-08-27 03:00:40 -05:00
Erik Johnson
54ff40be58
Use versioninfo tuple for comparison
2015-08-27 02:57:09 -05:00
Erik Johnson
04947db4f8
Return True result when changes dict is empty
2015-08-27 00:53:03 -05:00
Erik Johnson
6a417f5d41
Redact sensitive data in error message as well
2015-08-27 00:32:59 -05:00
Erik Johnson
b7a602112a
Fix lint violation
2015-08-27 00:32:46 -05:00
Gareth J. Greenaway
0a499bd0fa
Fixes to ipset module when using hash:net set types for both IP ranges, networks with prefix length and single hosts with prefix length
2015-08-26 20:35:19 -07:00
Colton Myers
0360994b38
Merge pull request #26679 from rallytime/bp-26661
...
Back-port #26661 to 2015.8
2015-08-26 16:52:41 -06:00
Colton Myers
735aa8eb5e
Merge pull request #26684 from techhat/spmreactor
...
Add reactor formulas to spm
2015-08-26 16:45:47 -06:00
Colton Myers
6fb7b15cf2
Merge pull request #26682 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-26 16:02:03 -06:00
TheBigBear
07a7950a91
Update version.py
2015-08-26 22:43:24 +01:00
Joseph Hall
2eef80414a
Document reactor packages
2015-08-26 14:59:01 -06:00
Joseph Hall
d1e25f9194
Add reactor formulas to spm
2015-08-26 14:57:48 -06:00
Colton Myers
ef76404def
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/releases/2015.5.5.rst
2015-08-26 14:32:03 -06:00
TheBigBear
63850e0392
add more python libs info in '--versions-report'
2015-08-26 21:25:05 +01:00
nfraison
fe5f1e2828
Used of salt.utils.version_cmp for string comparison and correct lint issue
2015-08-26 14:05:11 -06:00
nfraison
9f8aaedf46
Correct issue with docker api 1.19 due to move of mem parameters to host_config object
2015-08-26 14:05:11 -06:00
Colton Myers
75675a6ba9
Merge pull request #26676 from rallytime/bp-26648
...
Back-port #26648 to 2015.5
2015-08-26 13:46:01 -06:00
Colton Myers
d7f682cb5b
Merge pull request #26677 from rallytime/bp-26653
...
Back-port #26653 to 2015.5
2015-08-26 13:45:54 -06:00
Joseph Hall
03235a3fde
Merge pull request #26671 from rallytime/fix-10075
...
Warn users if cloud driver dependencies are missing.
2015-08-26 13:45:53 -06:00
Colton Myers
960dbba7ed
Merge pull request #26675 from rallytime/bp-26631
...
Back-port #26631 to 2015.5
2015-08-26 13:44:59 -06:00
Erik Johnson
084a2eacd3
Restructure git.latest state to work better when following HEAD
2015-08-26 14:29:33 -05:00
Erik Johnson
ffd93b4ebc
Redact command only if https basic auth detected
2015-08-26 14:28:54 -05:00
Colton Myers
09d0602d04
Merge pull request #26674 from rallytime/bp-26583
...
Back-port #26583 to 2015.8
2015-08-26 13:01:47 -06:00
Colton Myers
53ef35cea5
Merge pull request #26670 from techhat/confpkgs
...
Set up SPM to install -conf packages
2015-08-26 12:58:52 -06:00
rallytime
46075ca2e1
Pylint fix
2015-08-26 12:35:20 -06:00
Damian Myerscough
497ca96039
You can provide a X-Auth-Token when requesting jobs
2015-08-26 12:30:52 -06:00
Seth House
1af42eed36
Free 'fun' from the function signature namespace
...
'fun' is a common argument in Salt. format_call will choke if you
attempt to call a function that uses this argment. I.e.,:
>>> __salt__.saltutil.runner('mine.get', tgt='*', fun='network.ip_addrs', tgt_type='glob')
Traceback (most recent call last):
File "<console>", line 1, in <module>
TypeError: runner() got multiple values for keyword argument 'fun'
2015-08-26 12:29:25 -06:00
Pi3r
20eecdc7be
Fix get_load
...
The function `fetchone` always return a tuple (or None):
http://initd.org/psycopg/docs/cursor.html?highlight=fetchone#cursor.fetchone
2015-08-26 12:28:10 -06:00
Joseph Hall
ff6f29f1f7
Use syspaths
2015-08-26 12:24:08 -06:00
Joseph Hall
e4dcef5048
Document SPM package types
2015-08-26 12:21:28 -06:00
Jeremy Rosenbaum
dbbadc62de
add enable_zip_modules conig option
2015-08-26 12:21:26 -06:00
Jeremy Rosenbaum
92a9bd47a1
add zipimport functionality for module loading
2015-08-26 12:20:56 -06:00
Jeremy Rosenbaum
763ee20713
documentation for zip archive modules
2015-08-26 12:18:57 -06:00
Jeremy Rosenbaum
59e85fb402
Add zip to suffixes used for module sync
2015-08-26 12:18:51 -06:00
