valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
66,566 Commits 24 Branches 182 Tags 341 MiB
6360ecd3b3
Commit Graph

66566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
Mike Place
ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix 
include rotational disks in grains under linux
 2016-03-18 09:54:00 -06:00
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes 
Disable some boto tests causing issues in the test suite on 2016.3
 2016-03-18 09:50:37 -06:00
Mike Place
9be508e8f0 Merge pull request #31970 from twangboy/fix_win_file 
Add apply_template_on_contents for windows
 2016-03-18 09:37:29 -06:00
Mike Place
91c151ed55 Merge pull request #31966 from DSRCompany/features/intuit_multisyndic_ordered_failover 
Add syndic ordered failover.
 2016-03-18 09:36:00 -06:00
Nicole Thomas
810c6dbcbe Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput 
fixed ec2 get_console_output
 2016-03-18 09:13:47 -06:00
Nicole Thomas
1c7dc364ad Merge pull request #31958 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-03-18 09:12:43 -06:00
Lloyd Oliver
9c44604438 include rotational disks in grains under linux 2016-03-18 12:00:29 +00:00
twangboy
dfeae191c1 Add apply_template_on_contents for windows 2016-03-17 16:40:55 -06:00
Nicole Thomas
b9d0336cf8 Merge pull request #31964 from jfindlay/2015.8 
update 2015.8.8 release notes
 2016-03-17 15:22:04 -06:00
Dmitry Kuzmenko
e281b43668 Add syndic ordered failover. 2016-03-18 00:13:47 +03:00
Justin Findlay
b984659678 update 2015.8.8 release notes 2016-03-17 15:07:10 -06:00
Alexandre Létourneau
8305978879 fixed ec2 get_console_output 2016-03-17 15:51:26 -04:00
rallytime
3934c66fce Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-03-17 12:32:42 -06:00
Nicole Thomas
fefb694104 Merge pull request #31947 from cro/bp-31601 
Move proxymodule assignment earlier in proxy minion init
 2016-03-17 12:14:23 -06:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -06:00
Nicole Thomas
a86490ee68 Merge pull request #31948 from rallytime/disable-pylint-error 
Revert "not not" deletion and add comment as to why that is there
 2016-03-17 11:00:22 -06:00
Nicole Thomas
db3af864ae Merge pull request #31952 from rallytime/lint-2015.8 
Fix lint for 2015.8 branch
 2016-03-17 10:59:49 -06:00
rallytime
3e964ec9d4 Fix lint for 2015.8 branch 2016-03-17 10:12:58 -06:00
C. R. Oldham
4eb193edb7 Lint, unrelated but fixed anyway. 2016-03-17 10:05:28 -06:00
C. R. Oldham
d661081016 Lint. 2016-03-17 10:03:38 -06:00
Nicole Thomas
fb6d5fa44b Merge pull request #31946 from rallytime/merge-31886 
Fix pylint for #31886
 2016-03-17 09:45:10 -06:00
rallytime
86196cd59d Revert "not not" deletion and add comment as to why that is there 2016-03-17 09:39:14 -06:00
C. R. Oldham
59e0a6f923 Dont add this file 2016-03-17 09:10:38 -06:00
C. R. Oldham
c68b968403 Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py 2016-03-17 09:10:38 -06:00
Mike Place
7fabdbc42a Merge pull request #31741 from cro/adext 
Add ability for external_auth minions to be pulled from LDAP/AD
 2016-03-17 09:04:49 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Nicole Thomas
6d253d775b Merge pull request #31940 from sjorge/2016.3-schedule 
seconds is not always set, do not assume it is
 2016-03-17 08:55:12 -06:00
Mike Place
2d1f2a0c2e Merge pull request #31935 from twangboy/fix_build_script2 
Back port nullsoft build script from 2015.8
 2016-03-17 08:54:50 -06:00
Nicole Thomas
11642ed5b3 Merge pull request #31932 from sjorge/2016.3-badrebasesystembroken 
fix broken system module on SunOS cause by a0a66fa32600751d394d724b2f…
 2016-03-17 08:46:20 -06:00
Nicole Thomas
9ab4d6164b Merge pull request #31933 from rallytime/fix-test-links 
Fix linking syntax in testing docs
 2016-03-17 08:44:13 -06:00
Jorge Schrauwen
72c5d91306 seconds is not always set, do not assume it is 2016-03-17 11:47:31 +00:00
Ch3LL
b761059405 add absolute_import 2016-03-16 20:58:41 -06:00
Pedro Algarvio
cb196803fd
Skip boto tests which are pegging CPU and eating all available RAM. 2016-03-17 01:01:24 +00:00
twangboy
4af8c9dbfc Back port nullsoft build script from 2015.8 2016-03-16 17:57:04 -06:00
C. R. Oldham
4c112292f6 Prevent stacktrace when eauth is not a dict 2016-03-16 16:48:39 -06:00
rallytime
06dd2c0411 Fix linking syntax in testing docs 2016-03-16 16:43:53 -06:00
Jorge Schrauwen
d2222268df fix broken system module on SunOS cause by a0a66fa326 2016-03-16 22:23:57 +00:00
Mike Place
723d0ca19f Merge pull request #31930 from cro/bp-31601 
Backport changes from 2016.3
 2016-03-16 16:12:28 -06:00
Mike Place
ce765ad2df Merge pull request #31924 from jfindlay/2015.8 
update 2015.8.8 release notes
 2016-03-16 16:10:15 -06:00
C. R. Oldham
aa9a288b5a Add these files back in 2016-03-16 15:23:55 -06:00
C. R. Oldham
916ef26957 Remove .orig file mistakenly added, reformat example. 2016-03-16 15:20:55 -06:00
C. R. Oldham
3c8185571d Lint. 2016-03-16 15:19:43 -06:00
C. R. Oldham
9de9b9e86d Missin import 2016-03-16 15:11:19 -06:00
C. R. Oldham
d571f3b8fe Backport PR#31601 2016-03-16 15:09:54 -06:00
Pedro Algarvio
2fcc916c6a
Make sure all started processed, at least and as a last resort, are killed. 2016-03-16 19:40:49 +00:00
Pedro Algarvio
e1281e34cc
Don't assume the tests suite is running as root 2016-03-16 19:40:49 +00:00
Pedro Algarvio
916b6b402d
Skip tests if urllib3 is not installed 2016-03-16 19:40:48 +00:00
Nicole Thomas
390ef9fea7 Merge pull request #31922 from cachedout/issue_31890_1 
For 2015.8 head
 2016-03-16 13:07:11 -06:00
Justin Findlay
64dd8aebb2 update 2015.8.8 release notes 2016-03-16 11:49:01 -06:00