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
71,032 Commits 24 Branches 182 Tags 341 MiB
1f4a75f268
Commit Graph

71032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
8f8a6d2f68 Merge pull request #34466 from rallytime/bp-34436 
Back-port #34436 to 2016.3
 2016-07-05 21:57:15 -06:00
Mike Place
85f1f18239 Merge pull request #34467 from rallytime/bp-34457 
Back-port #34457 to 2015.8
 2016-07-05 21:56:58 -06:00
Thomas S Hatch
9912d23a18 Fix error where this fires if the value is not present 2016-07-05 21:22:55 -06:00
Thomas S Hatch
0c2ceeb88c fun is reserved by the stte system 2016-07-05 21:11:01 -06:00
Thomas S Hatch
40452ae863 the data field is nested.... 2016-07-05 20:55:13 -06:00
Thomas S Hatch
9e15337b74 Merge pull request #34432 from twangboy/fix_file.append 
Fix file.append
 2016-07-05 17:14:22 -06:00
twangboy
13f11fddce Remove refactoring code 2016-07-05 15:15:03 -06:00
twangboy
78f7c530bb Remove unit tests, integration tests written 2016-07-05 15:12:34 -06:00
twangboy
b83392edea Remove len() in favor of boolean test 2016-07-05 13:52:07 -07:00
twangboy
4373408163 Fix line error 2016-07-05 14:48:45 -06:00
twangboy
2479b53e2f Fix erroneous report on newline code 2016-07-05 14:48:45 -06:00
twangboy
75b6ed1fd5 Change back to binary read 2016-07-05 14:48:45 -06:00
twangboy
65753cff6d Use os.linesep instead of \n 2016-07-05 14:48:45 -06:00
twangboy
a55d63f086 Fix object names 2016-07-05 14:48:45 -06:00
twangboy
3e2fe12e5e Add new line if missing 2016-07-05 14:48:45 -06:00
twangboy
0b7821c8db Fix file.append state 2016-07-05 14:48:45 -06:00
Nicole Thomas
527d17710c Merge pull request #34464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-05 16:37:09 -04:00
Ryan Lane
746883741f Only access key metadata if we found key metadata 2016-07-05 13:56:13 -06:00
artxki
e97c00b018 Fix #34395 Nonfunctional default_password in states.postgres_user.present 2016-07-05 13:54:50 -06:00
Justin Anderson
0460edb9e2 Arch linux does not have osrelease or osmajorrelease grains (#34453) 2016-07-05 15:34:41 -04:00
arthtux
3fb80a21da Adding the log type (UDP) with the config file 2016-07-05 15:24:26 -04:00
Erik Grinaker
f981a5646a states/git: pass required cwd parameter to git.describe. 2016-07-05 14:14:13 -05:00
rallytime
e4a8c585d0 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/pkg.py
 2016-07-05 13:11:32 -06:00
Ryan Lane
c734ed6d21 Only access key metadata if we found key metadata (#34457) 2016-07-05 15:07:36 -04:00
Erik Johnson
6ef7ee198e Restrict use of --always to git 1.5.6 and newer 2016-07-05 13:57:22 -05:00
Erik Grinaker
c554b22fc8 modules/git: added --always parameter for git.describe(). 2016-07-05 13:52:23 -05:00
Mike Place
fc67a4e216 Merge pull request #34456 from thatch45/2016.3 
Be more careful when making the SMinion
 2016-07-05 12:41:57 -06:00
Mike Place
325be594ec Merge pull request #34380 from richardscollin/system-date-module-change-interface 
System date module change interface
 2016-07-05 12:10:42 -06:00
Erik Johnson
82a70e015f Ignore retcode when formatting highstate output 
Fixes #33915.
 2016-07-05 13:05:06 -05:00
Mike Place
54026c0255 Merge pull request #34403 from thatch45/dirty_winfix 
This fixes the fact that this utils module barfs on import
 2016-07-05 11:51:49 -06:00
Mike Place
91e095bb41 Merge pull request #34429 from terminalmage/pkg-latest-versioncheck 
Skip version checking for targeted packages in pkg.latest state
 2016-07-05 11:50:41 -06:00
Mike Place
72b4d6b52c Merge pull request #34452 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-05 11:49:19 -06:00
Thomas S Hatch
edd6b95c60 we need to be more careful when making the SMinion 
The SMinion is often used by backends like the salt client and api
this change relies more heavily on the pyzmq components to resolve
and return the correct loop, and only create the loop if needed.
 2016-07-05 11:09:56 -06:00
C. R. Oldham
0a264597ca Forgot reference to inotify (#34455) 2016-07-05 12:32:49 -04:00
Art
0d242a1e1e Fix #34395 Nonfunctional default_password in states.postgres_user.present (#34436) 2016-07-05 12:06:59 -04:00
rallytime
91120dba01 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-07-05 09:58:52 -06:00
Nicole Thomas
7bb0868c66 Merge pull request #34451 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-07-05 11:57:54 -04:00
Mike Place
a2fde91ad7 Merge pull request #34437 from hrumph/pkg_state_problem3 
Fix problem with calling latest_version in win_pkg in develop branch.
 2016-07-05 09:22:54 -06:00
Mike Place
7508d291d2 Merge pull request #34427 from twangboy/sign_fx 
Automated signing fixes for Ubuntu 16.04, 14.04, 12.04 (for dmurphy)
 2016-07-05 09:18:46 -06:00
rallytime
55a91e22be Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-07-05 09:13:50 -06:00
Mike Place
8c72ee56e4 Merge pull request #34435 from cachedout/backport_config_dir_integration 
Backport change to integraiton test suite
 2016-07-05 08:24:53 -06:00
Mike Place
dc22682351 Merge pull request #34420 from isbm/isbm-saltssh-followup 
Refactor command construction for a better readibility
 2016-07-02 15:40:00 -07:00
markuskramerIgitt
7257b8d832 Copy and delete silently, do not list each file 2016-07-02 22:36:49 +02:00
Michael Walton
ee1a28dd87 Lint fix 2016-07-02 12:37:43 -04:00
Michael Walton
c0d3043067 Remove saltenv param from function latest_version in win_pkg.py and use 
kwargs instead.
In pky.py, make sure that kwargs is always passed to latest version
and that the key saltenv is always set to __env__.
 2016-07-02 03:04:51 -04:00
Mike Place
0e2c71a537 Backport change to integraiton test suite 
Will avoid lint errors in earlier branches. Thanks to @terminalmage for pointing out my error.
 2016-07-01 16:10:34 -06:00
Erik Johnson
667f31a72a Skip version checking for targeted packages in pkg.latest state 
The mere fact that we have run pkg.latest_version will tell us if an
upgrade is available, by the value for that package name being a
non-empty string. So, performing version-checking here is overkill.
 2016-07-01 13:36:15 -05:00
Thomas S Hatch
dff5a6b7dc lint 2016-07-01 11:50:37 -06:00
Mike Place
b3875f397d Merge pull request #34400 from cachedout/issue_34379 
Fix uninitialized value
 2016-07-01 10:42:55 -07:00
Mike Place
e65d1ae374 Merge pull request #34401 from terminalmage/rpm-version_cmp 
Use rpmdev-vercmp as a fallback for version comparison on RHEL5
 2016-07-01 10:42:24 -07:00