valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,582 Commits 24 Branches 182 Tags 341 MiB
308aa5fd61
Commit Graph

67582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -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
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
74fabea3fa Merge pull request #31971 from SaltyCharles/patch-1 
fix typos in master config
 2016-03-18 09:10:49 -06:00
Nicole Thomas
3ab1a653b2 Merge pull request #31967 from kinow/patch-2 
Fix typo in pillar docs
 2016-03-18 09:05:02 -06:00
SaltyCharles
d6f6ca1ce7 fix typos in master config 2016-03-17 17:02:50 -07:00
Bruno P. Kinoshita
fa921e6e8b Fix typo in pillar docs 
Trivial typo, s/pacakges/packages/g
 2016-03-18 10:29:34 +13:00
Dmitry Kuzmenko
e281b43668 Add syndic ordered failover. 2016-03-18 00:13:47 +03:00
Justin Anderson
ef2db9a301 Skipping some boto tests that are broken 2016-03-17 11:05:43 -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
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
Mike Place
46712f7ef2 Merge pull request #31812 from whiteinge/slsutil-renderer 
Add slsutil.renderer execution function
 2016-03-17 09:02:21 -06:00
rallytime
98267ca100 Fix pylint for #31886 
Merges #31886
 2016-03-17 09:01:59 -06:00
Mike Place
5fe1987f08 Merge pull request #31934 from lyft/fix-references-to-boto-3-in-s3-module 
Fixed references to boto3 in boto_s3_bucket module
 2016-03-17 08:56:17 -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
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
fded78cc28 Merge pull request #31939 from kinow/patch-1 
Typo
 2016-03-17 08:44:41 -06:00
Jorge Schrauwen
72c5d91306 seconds is not always set, do not assume it is 2016-03-17 11:47:31 +00:00
Bruno P. Kinoshita
31a55a786e Typo 
Trivial typo. s/Nodgroups/Nodegroups/g
 2016-03-17 17:51:58 +13: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
Vivian Ho
e14e712c84 Removed blank line 2016-03-16 16:42:52 -07:00
Vivian Ho
7d002e0c61 Removed boto3 import dependency 2016-03-16 16:40:25 -07:00
C. R. Oldham
4c112292f6 Prevent stacktrace when eauth is not a dict 2016-03-16 16:48:39 -06:00
Jorge Schrauwen
d2222268df fix broken system module on SunOS cause by a0a66fa326 2016-03-16 22:23:57 +00:00
Mike Place
8e1116ca43 Merge pull request #31921 from cachedout/issue_31897 
Better error message for failed includes
 2016-03-16 16:11:48 -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
Ch3LL
5bcc5b2f21 fix pylint and remove super() 2016-03-16 11:44:55 -06:00
Mike Place
e5cc0740ea Better error message for failed includes 
Closes #31897
 2016-03-16 11:33:58 -06:00
Mike Place
e9c3d83a45 Merge pull request #31871 from ScoreUnder/brew_latest_version 
Implement the latest_version function in mac_brew
 2016-03-16 11:19:28 -06:00
C. R. Oldham
53476f0be4 Fix bad merge. 2016-03-16 11:13:37 -06:00
Mike Place
60635e95bf Merge pull request #31848 from jodv/api_client_whitelist 
NetapiClient client method whitelist
 2016-03-16 11:09:21 -06:00
C. R. Oldham
8a7b8853fa Fix structure of examples for external auth (was missing ':'), wrap some ldap calls in try/except, return a modified auth_list that replaces 'ldap()' entries with ldap matches instead of appending. 2016-03-16 10:44:54 -06:00
C. R. Oldham
22d14e1097 Lint. 2016-03-16 10:44:54 -06:00
C. R. Oldham
4ebe31a107 k 2016-03-16 10:44:54 -06:00
C. R. Oldham
0aebfae725 Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups 2016-03-16 10:44:00 -06:00
C. R. Oldham
b17753d3a1 Initial commit 2016-03-16 10:42:16 -06:00
C. R. Oldham
7c3f188b36 Lint. 2016-03-16 10:42:16 -06:00
C. R. Oldham
7aaa893549 k 2016-03-16 10:42:16 -06:00
C. R. Oldham
b4f902db1a Remove adext.py, not enough changes from ldap.py to warrant separate module. Add call in auth/__init__.py to do necessary lookups 2016-03-16 10:42:16 -06:00
C. R. Oldham
701da1707a Initial commit 2016-03-16 10:42:16 -06:00
Jeremy Rosenbaum
7830346ba7 fix lint error for extra newline 2016-03-16 09:41:34 -07:00
Mike Place
854d34aa30 Merge pull request #31626 from isbm/isbm-md5-to-sha1-dev 
Use SHA256 instead of MD5 (develop branch)
 2016-03-16 10:14:28 -06:00
Mike Place
b2ec37add1 Merge pull request #31914 from pzipoy/dev/pzipoy/not_applicable_serial 
Clean non-applicable SMBIOS info for serial, part, and version matches
 2016-03-16 09:07:14 -06:00
Nicole Thomas
a441d8e650 Merge pull request #31919 from corywright/fix-release-links 
Fix bad links/formatting for 2016 release notes
 2016-03-16 08:45:25 -06:00
Cory Wright
a689755693 Fix bad links/formatting for 2016 release notes 2016-03-16 09:11:28 -04:00
Bo Maryniuk
17802193f5 Fix logging message 2016-03-16 11:21:37 +01:00
Score_Under
3d6fe9a52a Implement the latest_version function in mac_brew 2016-03-16 09:24:10 +00:00