valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
70,944 Commits 24 Branches 182 Tags 341 MiB
f936dc4892
Commit Graph

70944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mike Place
5ddf417432 Merge pull request #34366 from steverweber/fix_servicerestart 
Update service.py
 2016-07-01 10:40:31 -07:00
twangboy
c804480982 Add changes suggested by @cachedout 2016-07-01 11:10:16 -06:00
Mike Place
485454febb Merge pull request #34426 from cro/inotify-linux-only 
Document that inotify is Linux only
 2016-07-01 10:04:38 -07:00
C. R. Oldham
54a02f25ba Document that inotify is Linux only 2016-07-01 10:58:40 -06:00
Mike Place
304dc0255d Merge pull request #34422 from lathama/patch-1 
Typo mine not mind
 2016-07-01 09:53:05 -07:00
Andrew
65f7ec5f3f Typo mine not mind 2016-07-01 10:38:25 -05:00
Nicole Thomas
4cc9392f77 Merge pull request #34405 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-07-01 11:02:40 -04:00
Nicole Thomas
d1cd36ab2b Merge pull request #34404 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-01 11:02:09 -04:00
Bo Maryniuk
973f3c2487 Refactor command construction for a better readibility 2016-07-01 15:53:53 +02:00
Mike Place
1cde6b26ea Merge pull request #34291 from cachedout/fast_test_startup 
Increase the speed of test suite startup
 2016-06-30 16:26:48 -07:00
Mike Place
7ee43db1e6 Merge pull request #34398 from renner/develop-salt-ssh-port-forwards 
Remote port forwarding with salt-ssh
 2016-06-30 15:49:42 -07:00
Mike Place
28504d19ab Revert "Py3 for integration test" 
This reverts commit cd959c640f.
 2016-06-30 16:25:42 -06:00
David Murphy
494deda074 Automated signing fixes for Ubuntu 16.04, 14.04, 12.04 2016-06-30 16:17:54 -06:00
rallytime
d850167efd Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-06-30 16:11:04 -06:00
rallytime
8398de0baf Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-06-30 16:08:57 -06:00
Thomas S Hatch
f8dcb38fb2 linux users don't need to know they are not on windows 2016-06-30 15:56:35 -06:00
Thomas S Hatch
41c45e351e This fixes the fact that this utils module barfs on import 2016-06-30 15:34:02 -06:00
Erik Johnson
7cefd4182d Use rpmdev-vercmp as a fallback for version comparison on RHEL5 
Resolves #34390.
 2016-06-30 15:29:16 -05:00
Mike Place
cd959c640f Py3 for integration test 2016-06-30 14:17:36 -06:00
Mike Place
51a4f09b93 Match overriden method 2016-06-30 14:16:48 -06:00
Mike Place
b02926f41c Immediate shutdown 2016-06-30 14:16:48 -06:00
Mike Place
5db2e1519f Increase the speed of test suite startup 
Tests now start in ~1s
 2016-06-30 14:16:47 -06:00
Johannes Renner
e421e4dda8 Support remote port forwarding with salt-ssh 2016-06-30 21:15:36 +02:00
Mike Place
b413f05a4f Fix uninitialized value 
Closes #34379
 2016-06-30 13:05:02 -06:00
Mike Place
d4c04e07f0 Merge pull request #34358 from thatch45/thor_more 
Add Thorium states to auto clean out old keys
 2016-06-30 11:37:32 -07:00
Mike Place
ff83c6d219 Merge pull request #34346 from kraney/boto_sns_topic_absent_state_does_not_remove_associated_subscription_arns 
added an optional parameter into boto_sns absent state to remove all …
 2016-06-30 11:25:57 -07:00
Mike Place
ad63b1d3d3 Merge pull request #34292 from twangboy/fix_runas 
Fix runas function for System Account
 2016-06-30 11:25:09 -07:00
Mike Place
e2e5520e2e Merge pull request #34340 from fracklen/returner/elasticsearch/index_date 
Make index_date configurable for elasticsearch_returner
 2016-06-30 11:20:03 -07:00
Mike Place
fe18bbb527 Merge pull request #34392 from cro/salt-cloud-doc-clarify 
Clarify that salt-cloud doesn't get installed by bootstrap
 2016-06-30 11:16:23 -07:00
Mike Place
ab7c7630ba Merge pull request #34355 from rallytime/python3-wheel-tests 
Add salt.utils import to wheel.key.py
 2016-06-30 10:52:29 -07:00
Mike Place
be9a831ef6 Merge pull request #34388 from rallytime/bp-34378 
Back-port #34378 to 2016.3
 2016-06-30 10:50:48 -07:00
Mike Place
fd39c73c48 Merge pull request #34384 from adelcast/dev/adelcast/NamespacedDictWrapper 
NamespacedDictWrapper: implement human readable representation
 2016-06-30 10:50:22 -07:00
C. R. Oldham
a8cc8872e1 Esxi dvs (#34352) 
* Better error messages when proxy fails to start

* Complete module to add host & migrate adapters to DVS

* Lint, and add documentation for function parameters.

* Lint, rebase.
 2016-06-30 12:43:59 -04:00
C. R. Oldham
6cce575d40 Clarify that salt-cloud doesn't get installed by bootstrap 2016-06-30 10:27:52 -06:00
Collin Richards
9d14d130fa Fix pylint issues 2016-06-30 10:46:35 -05:00
Thomas S Hatch
c6882ca974 suggest a sane default interval 2016-06-30 09:45:17 -06:00
Thomas S Hatch
feb59ab1c4 need a format without spaces 2016-06-30 09:41:40 -06:00
Thomas S Hatch
9ca23ed0e5 change to use a ctime string 2016-06-30 09:36:35 -06:00