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
69,832 Commits 24 Branches 182 Tags 341 MiB
597f346d57
Commit Graph

69832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
597f346d57 initialize super class of NamespacedDictWrapper 
Fixes #37264
 2016-10-27 14:28:01 -05:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
Mike Place
d0ce3de50c Merge pull request #37252 from vutny/suppress-init-grain-error 
Set logging level to 'info' for message about init system detection
 2016-10-27 15:15:01 +09:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Nicole Thomas
2087cfce90 Merge pull request #37257 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-26 11:32:36 -06:00
Thomas S Hatch
ea6155c3f4 Merge pull request #37254 from DSRCorporation/bugs/37191_minion_hangs 
Bugs/37191 minion hangs
 2016-10-26 10:28:41 -06:00
rallytime
2066f10d7b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-26 10:16:05 -06:00
Dmitry Kuzmenko
9ee24b2d70 Revert "Don't set the daemon flag for LoggingQueue process." 
This reverts commit c9c45a5d79.
 2016-10-26 17:09:19 +03:00
Denys Havrysh
3f20cc01ed Set logging level to 'info' for message about init system detection 2016-10-26 15:56:28 +03:00
Mike Place
d1a6bb72ac Merge pull request #37218 from darkalia/37187_supervisor_2016.3 
Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *b…
 2016-10-26 10:41:03 +09:00
Mike Place
760ed9f56d Merge pull request #37239 from Ch3LL/fix_cloud_timeout 
Fix cloud tests timeout
 2016-10-26 10:11:52 +09:00
Mike Place
6c5f619398 Merge pull request #37244 from rallytime/update-bootstrap 
Update bootstrap release to 2016.10.25
 2016-10-26 09:46:29 +09:00
Mike Place
bb7caf8c42 Merge pull request #37245 from rallytime/bp-36334 
Back-port #36334 to 2016.3
 2016-10-26 09:41:00 +09:00
Aditya Kulkarni
f64ca3c442 Update release notes and version added 2016-10-25 16:16:46 -06:00
Aditya Kulkarni
0a3d266d6b Add ability to specify disk backing mode for VMware cloud profile 2016-10-25 16:15:30 -06:00
rallytime
f728a5bc7b Update bootstrap release to 2016.10.25 2016-10-25 15:54:53 -06:00
Ch3LL
394fccf556 fix run_cloud timeout 2016-10-25 13:30:41 -06:00
Ch3LL
23947c5944 change timeout for cloud tests 2016-10-25 13:27:57 -06:00
Nicole Thomas
f49ccdf30f Merge pull request #37234 from rallytime/bp-37167 
Back-port #37167 to 2015.8
 2016-10-25 12:33:09 -06:00
Nicole Thomas
3c94315d35 Merge pull request #37233 from rallytime/bp-37154 
Back-port #37154 to 2016.3
 2016-10-25 12:32:56 -06:00
Nicole Thomas
94852f2eb1 Merge pull request #37232 from rallytime/bp-37153 
Back-port #37153 to 2016.3
 2016-10-25 12:32:41 -06:00
Nicole Thomas
a913eed92a Merge pull request #37228 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-25 12:22:57 -06:00
Daniel Kraemer
a7dbb5bfc9 fixes pkgrepo for fedora>22 saltstack/salt#31240 
This makes modules.yumpkg complete independend from yum. yum is not
installed in fedora>22, so this will actually fix pkgrepo in fedora.
 2016-10-25 10:48:19 -06:00
Alex Black
849af162f1 modules.win_system.py: Fix flag disabling AD Computer objects 2016-10-25 10:45:39 -06:00
Eric Radman
3829b7592f Update configuration examples for Joyent 
* Fix typo in profile example ('private_key' listed twice)
* Reflect Joyent's current new naming convention for VM sizes
* Update docs with modern images that are officially supported by Joyent
* Refresh example output of --list-sizes and --list-images
 2016-10-25 10:43:32 -06:00
rallytime
b99d6733b6 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-25 10:31:36 -06:00
Benjamin Allot
a8dfc6bb96 Issue #37187 Do not parse first /proc/1/cmdline binary if it's not *bin/init and set supervisord 2016-10-25 12:17:41 +02:00
Mike Place
6aaf6bf399 Merge pull request #37213 from cachedout/more_salttesting_fixes 
More salttesting fixes
 2016-10-25 16:53:33 +09:00
Mike Place
0bbf06bd86
Lint fix 2016-10-25 16:53:18 +09:00
Mike Place
f609917760
Workaround for utils 2016-10-25 16:51:30 +09:00
Mike Place
a6a24c2b3b
Workaround for tornado test startup error 2016-10-25 16:45:32 +09:00
Mike Place
88bcfa2c0a
Fix TCP test 2016-10-25 16:42:50 +09:00
Mike Place
b448455c31 Merge pull request #37207 from cachedout/issue_37194 
Correct documentation for mine_functions
 2016-10-25 16:25:08 +09:00
Mike Place
a5e1c041cc Merge pull request #37208 from cachedout/issue_37182 
Give multimion a process manager and its own destroy method
 2016-10-25 16:24:52 +09:00
Mike Place
1449770b0b
Give multimion a process manager and its own destroy method 2016-10-25 14:37:26 +09:00
Mike Place
e19ee88b6b Merge pull request #37206 from cachedout/transport_test_hang 
Address transport test hang
 2016-10-25 14:25:55 +09:00
Mike Place
9fcdf6da94
Correct documentation for mine_functions 
Closes #37194
 2016-10-25 14:12:46 +09:00
Mike Place
6737fd3ad9 Merge pull request #37179 from isbm/isbm-fix-saltapi-ssh-crash-2016-3 
Fix Salt-API ssh crash (2016.3)
 2016-10-25 13:52:19 +09:00
Mike Place
d608465d77 Merge pull request #37178 from isbm/isbm-fix-saltapi-ssh-crash 
Fix Salt-API ssh crash
 2016-10-25 13:51:50 +09:00
Mike Place
815dfd1c04 Merge pull request #37183 from gtmanfred/2016.3 
load tags should reference the actual load tags
 2016-10-25 13:38:00 +09:00
Mike Place
ca63376c97 Merge pull request #37188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-25 13:37:25 +09:00
Mike Place
c4393d5e9e
Address transport test hang 
It would appear that if an attribute error is raised when trying to detect a class atter,
that the test suite does not run the class teardown method but continues regardless. This
fixes the class attr error which then allows the teardown to run. Prior to this, if the
teardown did not run, the entire suite would hang out shutdown because it was blocked
on waiting for a ioloop to terminate.
 2016-10-25 13:16:35 +09:00
rallytime
ccb664050d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-24 10:20:46 -06:00
Nicole Thomas
d7e28d24a4 Pylint fix for 2016.3 (#37186) 
Refs #37175
 2016-10-24 09:42:41 -06:00
Daniel Wallace
1b7b4b1a0c load tags should reference the actual load tags 
Closes #37176
 2016-10-24 10:02:57 -05:00
Bo Maryniuk
28edda457e Do not prematurily raise an exception, let the main loop take care of it instead 2016-10-24 15:35:23 +02:00
Bo Maryniuk
372f2bbd93 Do not restart the whole thing if roster is not around 2016-10-24 15:35:13 +02:00
Bo Maryniuk
8d1450cc47 Fix PEP8 2016-10-24 15:35:03 +02:00
Bo Maryniuk
44da411c3a Do not prematurily raise an exception, let the main loop take care of it instead 2016-10-24 15:24:52 +02:00
Bo Maryniuk
ee48deeded Do not restart the whole thing if roster is not around 2016-10-24 15:24:09 +02:00