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,777 Commits 24 Branches 182 Tags 341 MiB
1b954dde4e
Commit Graph

34777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
1b954dde4e Merge branch '2014.7' into develop 2014-07-31 12:39:11 -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
6ad7be4e66 Merge branch '2014.7' into develop 2014-07-31 12:36:42 -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
ab7ad38abf Merge branch '2014.7' into develop 2014-07-31 12:29:33 -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
108c434095 Merge branch '2014.7' into develop 2014-07-31 12:24:25 -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
28a59fa730 Merge branch '2014.7' into develop 2014-07-31 12:15:48 -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
8a07ac9213 Merge branch '2014.7' into develop 2014-07-31 12:02:09 -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
Joseph Hall
12c51156f1 Merge pull request #14657 from dudz94/develop 
Add support for Ubuntu in localmod.py
 2014-07-31 09:59:03 -06:00
Lucas TADAJEWSKI
eddbb5f900 Add support for Ubuntu in localmod.py 2014-07-31 15:22:26 +02: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
157a4fd498 Merge pull request #14649 from hulu/str-format-tweak 
Tweak comment message formatting so that it doesn't outwit pylint
 2014-07-31 02:12:43 +01: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
Chris Rebert
2b5f16fe1c Tweak comment message formatting so that it doesn't outwit pylint 
Also, this is marginally more efficient due
to removing unnecessary dict accesses.

Old:
    ret['comment'] = some_format_string
    ret['comment'] = ret['comment'].format(...)
New:
    ret['comment'] = some_format_string.format(...)
    # ...with some extra syntactic complications due to complying
    # with line length limits.
 2014-07-30 14:09:54 -07:00
Colton Myers
7eb1ad63ab Merge pull request #14554 from cachedout/14515 
Fix typo
 2014-07-30 14:25:47 -06:00
Colton Myers
e5095ed420 Merge pull request #14637 from nmadhok/specify-user-present-state-defaults 
Specifying defaults for salt.states.user.present
 2014-07-30 14:24:32 -06: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
1571c7f06c Merge branch '2014.7' into develop 2014-07-30 13:56:52 -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
9f7f02b3ac Merge branch '2014.7' into develop 2014-07-30 13:48:40 -06:00
Colton Myers
0406655519 Add release notes for 2014.1.8 2014-07-30 13:48:18 -06:00
Pedro Algarvio
586642576a Add another which only changes the noc 2014-07-30 19:34:00 +01:00
Pedro Algarvio
a53ca96c76 Add another example for version comparison 2014-07-30 19:34:00 +01:00
Pedro Algarvio
4ccb73abac Add another version example to the tests 2014-07-30 19:33:59 +01:00
Pedro Algarvio
b24e1b9c49 Support a minor bugfix attribute in the version string 2014-07-30 19:33:59 +01:00
Pedro Algarvio
5e57a11c9e Switch ??? for n/a 2014-07-30 19:33:59 +01:00
Pedro Algarvio
f3edb2315c Stop hard coding the version name. 
Fixes saltstack/backlog/issues#11
 2014-07-30 19:33:59 +01:00
Pedro Algarvio
7e7407baa8 Version names only contain major and minor parts of the version 2014-07-30 19:33:59 +01:00
Pedro Algarvio
14f32e3f8c Show "Enterprise" instead of "SSE" 
Fixes saltstack/backlog#33
 2014-07-30 19:33:59 +01:00
Pedro Algarvio
adba14213f Report SSE on formatted version 2014-07-30 19:33:59 +01:00
Pedro Algarvio
87eac5cd5f Add boolean property to differentiate SSE 2014-07-30 19:33:59 +01: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