Commit Graph

27480 Commits

Author SHA1 Message Date
Colton Myers
7eb4aac222 Merge pull request #11105 from terminalmage/quickfix
Add versionadded RST directive for skip_suggestions
2014-03-10 15:48:38 -06:00
Erik Johnson
238efc822c Add versionadded RST directive for skip_suggestions 2014-03-10 16:47:28 -05:00
Joseph Hall
c605f06e89 Merge pull request #11104 from sandbender/mydevelop
Fresh fix commit for saltstack/salt repo issue #11096
2014-03-10 15:16:55 -06:00
Rudy X. Desjardins
d0a0f6f78c Fresh fix commit for saltstack/salt repo issue #11096 2014-03-10 17:12:22 -04:00
Mike Place
0c69bd99b2 Prevent zombies
Join multiprocess because otherwise it never gets cleaned up.

Typo
2014-03-10 15:09:38 -06:00
Samuel Smith
2b98cc80d0 Merge pull request #11100 from SmithSamuelM/sam_raet_19
Sam raet 19 Added timeout timers to Joiner and Joinent  Updated log messages
2014-03-10 14:54:11 -06:00
Samuel M Smith
8af3c40568 Changed printout 2014-03-10 14:52:22 -06:00
Samuel M Smith
146aa963f0 Merge remote-tracking branch 'upstream/develop' into sam_raet_19 2014-03-10 14:48:39 -06:00
Samuel M Smith
338b5ef4c0 Added timeouts to Joiner and Joinent 2014-03-10 14:46:45 -06:00
Bret Palsson
ff868c04d6 Complying with ISO 8601, don't omit the [T]
These events are useful and the timestamp is critical. Please don't change the standards. The rest of salt code does this correctly. If you need it for readability I suggest taking the event and emitting a log message with the format you wish to view it or tell your application reading the event to change the standard into non-standard.
------------
ISO 8601:2004(E): ISO. 2004-12-01. "4.3.2 NOTE: By mutual agreement of the partners in information interchange, the character _[T] may be omitted in applications where there is no risk of confusing a date and time of day representation with others defined in this International Standard._
2014-03-10 14:30:53 -06:00
Thomas S Hatch
d567d1310a Merge pull request #11088 from s0undt3ch/hotfix/immutable-lists-sum
`ImmutableList`'s should also support `__radd__`
2014-03-10 13:19:01 -07:00
Samuel M Smith
f476da8e8d removed start parameter as don't need with StoreTimer 2014-03-10 13:36:59 -06:00
Joseph Hall
fc83a02811 Merge pull request #11095 from s0undt3ch/hotfix/cloud-simple-data-types
`simple_types_filter` is only supposed to work for `dict`
2014-03-10 12:10:53 -06:00
Pedro Algarvio
07ef20b157 simple_types_filter is only supposed to work for dict. Refs #9860. 2014-03-10 18:05:36 +00:00
Pedro Algarvio
95922b387c Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:19 +00:00
Pedro Algarvio
7e68227c55 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:19 +00:00
Pedro Algarvio
237db7fcc7 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:18 +00:00
Pedro Algarvio
909a31b78c Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:18 +00:00
Pedro Algarvio
4002d19d4c Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:18 +00:00
Pedro Algarvio
74380bf8f4 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:52:18 +00:00
Pedro Algarvio
e1be985100 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
a87972c182 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
ab6241a5bc Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
d74446337b Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
ec40e147fd Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
3d22c69e43 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
ca420e171a Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
3a74b1e9d2 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
9289584bb8 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
1aa49861ca Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
1602fa681b Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
cbca3ee8b5 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
b2f1feb5ea We can't continue on truth values. 2014-03-10 17:51:55 +00:00
Pedro Algarvio
1984c34b03 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
1c83147789 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
f12bc28592 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
160dcc26f7 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:55 +00:00
Pedro Algarvio
ac8ee65f20 Not renaming, no need for __virtualname__. Return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
a22c484be2 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
a51d87e7ec Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
5bc32354b2 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
a5c89a410b Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
f38c24ab3e Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
f079978fec Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
ee7817e85a Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
11c98456f4 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
95b037fbc3 Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
7c8828cc3f Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
f2de269e2b Not renaming, no need for __virtualname__. Return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00
Pedro Algarvio
1ef4cd11cb Not renaming, return a boolean in __virtual__(). 2014-03-10 17:51:54 +00:00