CaptTofu
b90339908b
Removed references to internal region terminology
2014-03-11 11:20:18 -07:00
Mathieu Le Marec - Pasquet
66e98055c9
cron: fix tests
2014-03-11 18:13:06 +00:00
Mike Place
cdd5d86bbf
Clarify where the Salt SSH configuration comes from.
2014-03-11 11:59:07 -06:00
Adrien "ze" Urban
ec314d4ef6
file.blockreplace(append_if_not_empty): test for missing \n at EOF
2014-03-11 18:46:01 +01:00
Mike Place
8fbead772e
Fix broken shell script.
2014-03-11 11:37:35 -06:00
CaptTofu
1516808ee7
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2014-03-11 13:20:19 -04:00
CaptTofu
e6f51e4e5b
Added HP Cloud documentation
2014-03-11 10:18:28 -07:00
Daniel Wallace
2b5e4c272a
[Nova] allow building from hidden images
2014-03-11 12:17:34 -05:00
Thomas S Hatch
5cc01d1e5f
whitespace
2014-03-11 10:10:55 -06:00
Thomas S Hatch
5676968524
Merge pull request #11120 from makinacorpus/cronfix
...
cron: Fix for #10959
2014-03-11 09:02:21 -07:00
Thomas S Hatch
249f8c05bc
Merge pull request #11116 from jasonrm/module-brew-upgrade
...
brew: Add pkg.upgrade support
2014-03-11 09:00:08 -07:00
Thomas S Hatch
0c07a4b3d6
Merge pull request #11115 from jasonrm/module-brew-pkglist
...
brew: Use salt.utils.version_cmp to determine latest package version installed.
2014-03-11 08:59:39 -07:00
Thomas S Hatch
cedcbfe76a
Merge pull request #11110 from amco/add-rbenv-install-as-state
...
Add rbenv.install_rbenv as separate state
2014-03-11 08:58:47 -07:00
Thomas S Hatch
b02204d84d
Merge pull request #11029 from whiteinge/event-runner
...
Add event function to state runner for light event interaction via CLI
2014-03-11 08:51:56 -07:00
Thomas S Hatch
84d5c525b0
Merge pull request #10972 from s0undt3ch/hotfix/force-virtual-booleans
...
The `__virtual__()` function should only return strings on renames.
2014-03-11 08:51:11 -07:00
Joseph Hall
5e68ede61c
Merge pull request #11113 from gtmanfred/cloud
...
clean up the volume_delete and volume_detach cloud states
2014-03-11 08:28:22 -06:00
Daniel Wallace
80413734a7
Clean up pylint
2014-03-11 09:15:42 -05:00
Daniel Wallace
96dd716104
clean up nova volume_delete and volume_detach
2014-03-11 08:35:47 -05:00
Daniel Wallace
d6a4dc3d4e
Add apikey support for novaclient
...
You are required to specify the auth_system to use apikeys since
keystone doesn't support them by default.
2014-03-11 08:35:47 -05:00
Daniel Wallace
c4ada79552
add volume_delete and volume_detach states
2014-03-11 08:35:47 -05:00
Pedro Algarvio
c21b99609d
Merge pull request #11117 from fsniper/develop
...
Fix for #10656 : __env__ should be passed around instead of env
2014-03-11 12:12:25 +00:00
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
