valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,431 Commits 24 Branches 182 Tags 341 MiB
60a34eca63
Commit Graph

34431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
60a34eca63 Backport #14372 to 2014.7 2014-07-31 12:47:59 -06:00
Khris Richardson
7f6244feab fix error introduced in 15c6aa829c 2014-07-31 12:47:25 -06:00
Colton Myers
0a1a26323f Backport #14369 to 2014.7 2014-07-31 12:38:55 -06:00
Nitin Madhok
22520053d9 Fixing pylint violation 2014-07-31 12:38:48 -06:00
Nitin Madhok
8b47b4b27b Adding output quiet option in docker push module func 2014-07-31 12:38:48 -06:00
Colton Myers
55447cfbf4 Backport #14335 to 2014.7 2014-07-31 12:36:23 -06:00
Hazael Sanchez
46c9a9769f Remove ssh hard dependency on a user's homedir. 
Fixes issue #13458.

If the key lives under a user's homedir then there is still
a requirement of the homedir existing.  This is to preserve the previous
behavior.
 2014-07-31 12:35:15 -06:00
Colton Myers
ddfc834f1f Backport #14311 to 2014.7 2014-07-31 12:29:14 -06:00
Chris Rebert
ba04dfc665 salt.key: rm duplicate import of salt.crypt 
************* Module salt.key
salt/key.py:21: [W0404(reimported), ] Reimport 'salt.crypt' (imported line 16)
 2014-07-31 12:29:05 -06:00
Colton Myers
bd7ac90b2f Backport #14298 to 2014.7 2014-07-31 12:23:47 -06:00
Michael Birtwell
32acb7aeae Pull out pending_events changes and reuse 
PendingEventsBase implements all the pending_events queue management
Make both normal SaltEvent and raetevent.SaltEvent inherit from this to
standardise the get_event interface.
Update tests for event.SaltEvent (Couldn't find tests for
raetevent.SaltEvent)
 2014-07-31 12:23:38 -06:00
Michael Birtwell
cdb8ad8cb6 Don't risk missing events in gather_job_info 
Seen with syndic, but in theory affects all setups. When a we call
gather_job_info if an event comes in for the main job we can discard the
event whilst we are looking for the gather_job_info event. To work
around I've made gather_job_info add events for the main job to the
pending_events list. get_event now always checks that list for events
matching it's tag

Conflicts:
	salt/utils/event.py
 2014-07-31 12:23:38 -06:00
Colton Myers
c5086fa310 Backport #14297 to 2014.7 2014-07-31 12:15:27 -06:00
Michael Birtwell
e8dad986ae Disable check for all minions returned when using syndic 
This optimisation meant that if all minions targeted were connected to
syndics, rather than directly we would never look for events
 2014-07-31 12:15:15 -06:00
Michael Birtwell
c53e8947ed Revert "bug: syndic does not return in 1 seconds" 
This reverts commit 14fb688054.

Conflicts:
	salt/client/__init__.py

See my comments on PR#10336. That commit looked wrong to me and I got
no response to my query. It understandable that the change wouldn't have
caused much pain for most people but I suspect that commit 36601005 is
rendered unnecessary by reverting this.
 2014-07-31 12:15:15 -06:00
Colton Myers
f742b4fad8 Backport #14263 to 2014.7 2014-07-31 12:01:32 -06:00
Thomas Jackson
4eb65c8275 Remove another weird hard-coded sleep 
If this is an issue we need something other than sleeps ;)

similar to #14223
 2014-07-31 12:01:20 -06:00
Thomas Jackson
54553f9f59 Since this was changed to use channels this is no longer necessary, since the channel does this under the hood 2014-07-31 12:01:20 -06:00
Pedro Algarvio
dfd4686a6c Merge pull request #14654 from whiteinge/doc-saltmod-state 
Add missing code block to saltmod state docs
 2014-07-31 03:45:16 +01:00
Seth House
b4c9184628 Merge pull request #14642 from krallin/2014.7 
Add a Debian init script for salt-api
 2014-07-30 19:25:22 -07:00
Seth House
215e307185 Add missing code block to saltmod state docs 2014-07-30 19:21:24 -07:00
Pedro Algarvio
73ccf71038 Merge pull request #14652 from garethgreenaway/remove_log_debug_schedule 
removing logging from module schedule.py, not in use.
 2014-07-31 01:28:34 +01:00
Gareth J. Greenaway
30c673b6a0 removing logging from module schedule.py, not in use. 2014-07-30 17:20:45 -07:00
Colton Myers
1ffd6168a3 Merge pull request #14644 from garethgreenaway/14626_file_append 
Fix to file.append
 2014-07-30 14:23:17 -06:00
Colton Myers
68f5dce95b Merge pull request #14648 from cachedout/tmpdir_2014_7 
Tmpdir 2014 7
 2014-07-30 13:55:49 -06:00
Colton Myers
0406655519 Add release notes for 2014.1.8 2014-07-30 13:48:18 -06:00
Pedro Algarvio
3a16b42eb9 Add another which only changes the noc 2014-07-30 18:10:22 +01:00
Pedro Algarvio
7a77942a82 Add another example for version comparison 2014-07-30 18:10:16 +01:00
Pedro Algarvio
fc239f8cd9 Add another version example to the tests 2014-07-30 18:10:09 +01:00
Pedro Algarvio
827ccd5338 Support a minor bugfix attribute in the version string 2014-07-30 18:10:02 +01:00
Pedro Algarvio
406891427a Switch ??? for n/a 2014-07-30 18:09:57 +01:00
Pedro Algarvio
4ece94057f Stop hard coding the version name. 
Fixes saltstack/backlog/issues#11
 2014-07-30 18:09:51 +01:00
Pedro Algarvio
90bb1969f0 Version names only contain major and minor parts of the version 2014-07-30 18:09:45 +01:00
Pedro Algarvio
0467bdd1cb Show "Enterprise" instead of "SSE" 
Fixes saltstack/backlog#33
 2014-07-30 18:09:39 +01:00
Pedro Algarvio
d71e33fb05 Report SSE on formatted version 2014-07-30 18:09:32 +01:00
Pedro Algarvio
996d8ec76b Add boolean property to differentiate SSE 2014-07-30 18:09:24 +01:00
Gareth J. Greenaway
47099a9d2d Fixing a reported issue when using file.append to append strings to a file when the string contains an equal sign. Also added the fix to file.prepend and file.write. 2014-07-30 10:01:09 -07:00
Thomas Orozco
08a8a8cee8 Add a Debian init script for salt-api 2014-07-30 17:53:05 +02:00
Nicole Thomas
4523a0efef Merge pull request #14636 from rallytime/pylint_fix 
Fix trailing whitepsace
 2014-07-30 08:51:41 -06:00
rallytime
c730da8f84 Fix trailing whitepsace 2014-07-30 08:50:45 -06:00
Joseph Hall
77e81614bd Merge pull request #14610 from rallytime/cloud_docs 
Update docs for using salt-cloud on OSX to install curl-ca-bundle
 2014-07-30 00:06:44 -06:00
Joseph Hall
2333246dec Merge pull request #14616 from garethgreenaway/14308_archive_tar_documentation 
Fixing docstrings for archive.tar to be consistent.
 2014-07-30 00:03:52 -06:00
Gareth J. Greenaway
053986b134 Fixing docstrings for archive.tar to be consistent. Per 14308. 2014-07-29 20:45:19 -07:00
Pedro Algarvio
9ed937cd5b Merge pull request #14603 from garethgreenaway/bootstrap_fixes 
Fixing bootstrap script to install python-apt for Ubuntu & Debian minions
 2014-07-30 03:52:25 +01:00
Samuel Smith
f0a55cf5ca Merge pull request #14611 from SmithSamuelM/sam_2014.7 
Support for updated presence behavior in Raetv0.2.12
 2014-07-29 15:47:58 -06:00
Samuel M Smith
9b9be0a387 Merge remote-tracking branch 'upstream/2014.7' into sam_2014.7 2014-07-29 15:46:42 -06:00
rallytime
ea4b045944 Update docs for using salt-cloud on OSX to install curl-ca-bundle 2014-07-29 15:29:33 -06:00
Samuel M Smith
3362c998af Support for new reapeds dict produced by presence management 
Requires Raet v02.11
 2014-07-29 14:55:48 -06:00
Mike Place
7500e82e46 Align tmpdir and deploy dir 2014-07-29 13:12:39 -06:00
Gareth J. Greenaway
40e8c32feb Fixing bootstrap script to install python-apt for Ubuntu minions and Debian minions greater than the 5.0 (Lenny) release. With some recent changes related to virtual packages, python-apt is now necessary to be able to manage packages. 2014-07-29 11:54:15 -07:00