Commit Graph

27506 Commits

Author SHA1 Message Date
Mathieu Le Marec - Pasquet
cfa93f9f92 cron: Fix for #10959 2014-03-11 09:18:11 +00:00
Onur Yalazi
6c370c3367 Fix for #10656: __env__ should be passed around instead of env 2014-03-11 09:02:44 +02:00
Thomas S Hatch
a01cca3ce8 basic ability to round robin to worker procs 2014-03-10 23:38:09 -06:00
Jason R. McNeil
a4c308af97 brew: Use salt.utils.version_cmp to determine latest package version.
Although only one version is ever linked, the output from `brew list --versions` has output similar to the following.
```
autoconf 2.69
ffmpeg 2.1.3 2.1.4
percona-server 5.6.15-rel63.0
freetype 2.5.2 2.5.3
jenkins 1.553 1.554
```
2014-03-10 22:26:07 -07:00
Jason R. McNeil
890c6b1da0 Add pkg.upgrade support for brew 2014-03-10 21:51:57 -07:00
Thomas S Hatch
907c98ec7d Add worker creation to raet master 2014-03-10 22:36:48 -06:00
Thomas S Hatch
bfb40f8cc0 add worker_floscript to master config 2014-03-10 22:23:57 -06:00
Thomas S Hatch
3b9fcc6e80 Initial floscript for a worker 2014-03-10 22:20:49 -06:00
Thomas S Hatch
3a321dd6ab Add behaviors for a worker 2014-03-10 22:19:15 -06:00
Thomas S Hatch
da2d6edd55 Add rx and tx frames to minion floscript 2014-03-10 21:10:48 -06:00
Thomas S Hatch
af8ac6a84e update master floscript to use new meathods 2014-03-10 21:03:57 -06:00
Thomas S Hatch
da3a08851b update minion floscript to use central router 2014-03-10 20:52:52 -06:00
Thomas S Hatch
1b6526261c Modify flo package to use core now 2014-03-10 20:32:52 -06:00
Mike Place
df0643924e Merge pull request #11111 from s0undt3ch/hotfix/immutable-lists-sum
Stop running the test while it's failing
2014-03-10 19:44:59 -06:00
Pedro Algarvio
a084303c91 Stop running the test while it's failing 2014-03-10 23:52:38 +00:00
Samuel Smith
db15c923a0 Merge pull request #11109 from SmithSamuelM/sam_raet_20
Sam raet 20 Added timeout and redo timers to the Allower/Allowent transaction "CurveCP" Handshake
2014-03-10 17:16:35 -06:00
Samuel M Smith
6ca21702b2 Merge remote-tracking branch 'upstream/develop' into sam_raet_20 2014-03-10 17:15:08 -06:00
Thomas S Hatch
3c18f32f8e Add exceptions 2014-03-10 17:05:31 -06:00
Thomas S Hatch
c31af71a64 Add core.py, converge on DRY code in master and minion 2014-03-10 16:56:43 -06:00
Samuel M Smith
be6587ecd1 Merge remote-tracking branch 'upstream/develop' into sam_raet_20 2014-03-10 16:54:32 -06:00
Samuel M Smith
a8d23be33b Added new test 2014-03-10 16:53:48 -06:00
Samuel M Smith
046a62c42b Added timers (timeout and redo) to Allower and Allowent transaction 2014-03-10 16:50:36 -06:00
Brian Lanier
71481755c6 Merge branch 'develop' into add-rbenv-install-as-state 2014-03-10 15:46:24 -07:00
Thomas S Hatch
96fa7cc7eb Merge pull request #11099 from bretep/patch-4
Complying with ISO 8601, don't omit the [T]
2014-03-10 14:57:25 -07:00
Thomas S Hatch
564476d75d Merge pull request #11103 from cachedout/10867
Prevent zombies
2014-03-10 14:56:37 -07:00
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