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
85,092 Commits 24 Branches 182 Tags 341 MiB
edcb64de76
Commit Graph

85092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Volodymyr Samodid
1fb94a08e0
update MasterPillarUtil 
update get_minion_grains method. Return empty dict if target list is
  empty
 2018-01-29 09:31:14 -05:00
Nicole Thomas
9fb4d4a528
Merge pull request #45688 from bdrung/raise-max-open-files 
Raise LimitNOFILE to default max open files
 2018-01-29 09:26:56 -05:00
Nicole Thomas
79da49ec8b
Merge pull request #45686 from bdrung/2017.7 
Use dbus-run-session instead of dbus-launch
 2018-01-29 09:24:10 -05:00
Nicole Thomas
7fb666bcd2
Merge pull request #45740 from terminalmage/fix-incorrect-version-comparison 
Fix incorrect attempt at version comparison.
 2018-01-29 09:12:04 -05:00
Nicole Thomas
cb6ce378ea
Merge pull request #45459 from vutny/salt-cloud-fix-loading-utf-cache 
[2016.11] Salt Cloud: fix loading UTF-8 cached data
 2018-01-29 08:57:22 -05:00
Nicole Thomas
fe636f53f8
Merge pull request #45747 from SteffenKockel/2017.7 
Fix typos
 2018-01-29 08:53:27 -05:00
Denys Havrysh
e80bfb20c6
The zypper.mod_repo: fix typo in the docstring 2018-01-29 15:47:14 +02:00
Benjamin Drung
319b513183 Fix typos 
lintian found several spelling errors.

Pull request: https://github.com/saltstack/salt/pull/41404

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
Signed-off-by: Steffen Kockel <steffen.kockel@profitbricks.com>
 2018-01-29 10:44:23 +01:00
Denys Havrysh
b370796e9d
Salt Cloud: write/read cached data in UTF-8 explicitly 2018-01-29 11:06:59 +02:00
Denys Havrysh
cd999201be
[2016.11] Salt Cloud: fix loading UTF-8 cached data 
Fixes #20823
 2018-01-29 11:06:47 +02:00
Erik Johnson
1e0b38dcaa
Fix incorrect attempt at version comparison. 
A LooseVersion cannot be directly compared to a str or unicode type.
 2018-01-28 17:07:47 -06:00
William Villeneuve
217791079b some code cleanup (lint errors and escape_argument as _cmd_quote) 2018-01-28 12:42:33 -05:00
Benjamin Drung
f49d0a0eec Use dbus-run-session instead of dbus-launch 
As described in
<https://lists.debian.org/debian-devel/2016/08/msg00554.html>
Simon McVittie tries to reduce how much dbus-launch is used in Debian.

This change requires dbus 1.8 or newer, but does not require dbus-launch
(shipped by dbus-x11) or X11.

Closes: #836297
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-01-28 16:16:07 +01:00
Nicole Thomas
eb91ae8b6e
Merge pull request #45734 from terminalmage/fix-trimmed-output 
Fix traceback in CLI output when value is trimmed
 2018-01-28 08:35:56 -05:00
Erik Johnson
966ad07452
Fix traceback in CLI output when value is trimmed 
The comparison here was looking for the wrong string, causing the
trimmed value not to be detected and leading to a traceback several
lines later.
 2018-01-27 20:48:41 -06:00
Nicole Thomas
7516bfbffe
Merge pull request #45712 from bdrung/fix-version-decode 
Decode git call output in Python 3
 2018-01-27 21:03:20 -05:00
Nicole Thomas
91b848debb
Merge pull request #45720 from dwoz/issue-44449-prod-fix 
Salt cloud adds newly created insances to cache
 2018-01-26 17:45:42 -05:00
Nicole Thomas
831698f066
Merge pull request #45724 from eliasp/2017.7-typo-from-hell 
Typo (`Hellium` → `Helium`)
 2018-01-26 17:37:44 -05:00
Nicole Thomas
cdb21a0186
Merge pull request #45722 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-26 17:15:40 -05:00
Elias Probst
bec78276f3
Replace left-over mistyped codename reference (Hellium → 2014.7.0) 2018-01-26 22:52:10 +01:00
rallytime
8e3a2e25fe
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-01-26 15:17:56 -05:00
Gareth J. Greenaway
359265869f
Adding a couple tests to ensure that duration is included in state run results even when states do not run. 2018-01-26 12:06:29 -08:00
Gareth J. Greenaway
912347abc3
Include the duration when a state does not run, for example when the onchanges requisite is not met. 2018-01-26 12:06:28 -08:00
Daniel Wozniak
4a4bd6119d Salt cloud adds newly created insances to cache 
This patch resolves #44449 by fixing msgpack serialization issues in
python 3 and making sure all new instances are added to the cache.
 2018-01-26 11:24:13 -07:00
Nicole Thomas
3a413e96c5
Merge pull request #45718 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-01-26 11:49:43 -05:00
rallytime
f10c7ee92d
Merge branch '2017.7.3' into '2017.7' 
No conflicts.
 2018-01-26 09:59:21 -05:00
Nicole Thomas
d0955519cf
Merge pull request #45690 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2018-01-26 09:41:44 -05:00
Nicole Thomas
9c92e93834
Merge pull request #45710 from michelsen/fix-chocolatey-state-bug 
Added source argument to function call
 2018-01-26 09:30:48 -05:00
William Villeneuve
1c29bc5a3d fixed quoting of script path in cmd.script 2018-01-26 09:05:18 -05:00
Benjamin Drung
217183405a Decode git call output in Python 3 
The subprocess communicate() method returns byte streams for stdout and
stderr in Python 3. They need to be decoded to str. Otherwise the
version string parsing will fail:

Traceback (most recent call last):
  File "salt/version.py", line 522, in __discover_version
    return SaltStackVersion.parse(out)
  File "salt/version.py", line 267, in parse
    'Unable to parse version string: \'{0}\''.format(version_string)
ValueError: Unable to parse version string: 'b'c0e6782d''
 2018-01-26 13:11:34 +01:00
Levi Dahl Michelsen
8accc0ce5c
Added source argument to function call 2018-01-26 12:27:33 +01:00
Nicole Thomas
e4047a1234
Merge pull request #45511 from twangboy/win_fix_git 
Add correct path to ssh.exe for Windows
 2018-01-25 17:16:09 -05:00
Nicole Thomas
a550e8d25d
Merge pull request #45694 from twangboy/win_reg_add_keys 
Add support for additional reg keys
 2018-01-25 16:39:23 -05:00
Nicole Thomas
fe194d755f
Merge pull request #45700 from Ch3LL/7.3_rn 
Add PRs to 2017.7.3 Release Notes
 2018-01-25 15:56:44 -05:00
Ch3LL
84c8216901
Add PRs to 2017.7.3 Release Notes 2018-01-25 15:51:34 -05:00
twangboy
8f53cd2d68
Add new keys to subkey_slash_check 2018-01-25 11:09:30 -07:00
twangboy
62050c711c
Add support for additional reg keys 
HKEY_CLASSES_ROOT
HKEY_CURRENT_CONFIG
 2018-01-25 10:39:27 -07:00
rallytime
d4dac9f7cc
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
 2018-01-25 10:42:14 -05:00
Benjamin Drung
bbedeec756 Raise LimitNOFILE to default max open files 
The configuration option max_open_files defaults to 100,000, but the
salt-master service is only started with a limit of 16,384 open files.
Therefore the higher limit cannot be applied and there will be a log
message:

Current values for max open files soft/hard setting: 16384/16384
The value for the 'max_open_files' setting, 100000, is higher than what
the user running salt is allowed to raise to, 16384. Defaulting to
16384.

This is related to #40173.
 2018-01-25 16:17:48 +01:00
Nicole Thomas
ce41f6a6ee
Merge pull request #45681 from damon-atkins/2017.7.3_win_release_notes 
2017.7.3 Release notes for Windows
 2018-01-25 10:13:17 -05:00
Nicole Thomas
7ceebf62f0
Merge pull request #45577 from zer0def/fix-git-detached-31363 
git.detached with force_clone fails when it can't create a target directory that already exists
 2018-01-25 09:32:10 -05:00
Nicole Thomas
693f72d5a7
Merge pull request #45667 from gtmanfred/syu 
default to upgrading when refreshing on archlinux
 2018-01-25 09:05:23 -05:00
Nicole Thomas
2f303439b7
Merge pull request #45672 from rallytime/bp-45667 
Back-port #45667 to 2017.7.3
 2018-01-25 09:04:53 -05:00
Damon Atkins
1d21f86228
Update 2017.7.3.rst 2018-01-25 19:37:32 +11:00
Nicole Thomas
bec946b080
Merge pull request #45674 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.3 to 2017.7
 2018-01-24 17:46:30 -05:00
Nicole Thomas
50de847191
Merge pull request #45589 from gtmanfred/2017.7 
change webhook headers to dict
 2018-01-24 17:32:36 -05:00
Nicole Thomas
3a6837e232
Merge pull request #45675 from Ch3LL/rn_2016.11.9 
Add new commits to 2016.11.9 release notes
 2018-01-24 17:29:33 -05:00
Daniel Wallace
74bbaeb7ce
we should default to upgrading when refreshing on archlinux 
Archlinux does not do resolution for soname bumps, so if one set of packages is
updated, but something depended on a dependency package's soname, and it is
bumped, the other package will break.

When refreshing the package database, there should always be a -Su, run to
upgrade all other packages on the system.  But still allow sysupgrade to be set
to false to override this behavior.

http://gist.io/5660494

make review changes
 2018-01-24 17:19:44 -05:00
Daniel Wallace
44c601102a
we should default to upgrading when refreshing on archlinux 
Archlinux does not do resolution for soname bumps, so if one set of packages is
updated, but something depended on a dependency package's soname, and it is
bumped, the other package will break.

When refreshing the package database, there should always be a -Su, run to
upgrade all other packages on the system.  But still allow sysupgrade to be set
to false to override this behavior.

http://gist.io/5660494

make review changes
 2018-01-24 15:06:19 -07:00
Ch3LL
7b5bed36d9
Add new commits to 2016.11.9 release notes 2018-01-24 16:16:52 -05:00