Steve Weber
c47ffd9daf
lint
2014-10-10 12:35:02 -04:00
Steve Weber
53cda4eb96
get list of vm names fast
...
get list of vm names FAST without hacky slow code.
time went from 30s to 0.5s on our env.
2014-10-10 11:36:38 -04:00
Nicole Thomas
80379c19f4
Merge pull request #16541 from techhat/status
...
Add status.process monitoring state
2014-10-10 08:56:37 -06:00
Joseph Hall
845ca2b85a
Add status.process monitoring state
2014-10-10 07:29:16 -06:00
Pedro Algarvio
40e8840bc7
Merge pull request #16260 from mgwilliams/lxc
...
modules.lxc: expand $PATH on the container instead of the host
2014-10-10 01:44:50 +01:00
Nicole Thomas
45d9444462
Merge pull request #16523 from techhat/lxc
...
Remove self-referencial cross-calls from lxc module
2014-10-09 17:06:12 -06:00
Joseph Hall
f6f4021408
Linting
2014-10-09 15:24:17 -06:00
Joseph Hall
3fc2cbdab6
Merge pull request #16483 from steverweber/cloud_vsphere
...
list_nodes_min parse vm nodes for vm names.
2014-10-09 15:16:11 -06:00
Nicole Thomas
2901e9439b
Merge pull request #16514 from cachedout/master_doc_fix
...
Small doc fixes
2014-10-09 15:07:17 -06:00
Mike Place
32aed99cb9
Merge pull request #16515 from rallytime/remove_print
...
Remove print from tests
2014-10-09 14:49:03 -06:00
Joseph Hall
12f96f64e0
Merge pull request #16517 from steverweber/cloud_state
...
Cloud state absent was missing NOT on has_instance
2014-10-09 14:44:12 -06:00
Joseph Hall
60209231ef
Removed last two cross-call refs
2014-10-09 14:32:31 -06:00
Joseph Hall
c3a6c5ea6f
Remove self-referencial cross-calls
2014-10-09 14:23:24 -06:00
Erik Johnson
d3c74d967d
Fix dummy versionadded entry
2014-10-09 14:34:00 -05:00
Samuel Smith
c0862a271b
Merge pull request #16520 from SmithSamuelM/sam_dev1
...
Changed way timeout in RaetChannel.send() works
2014-10-09 12:30:51 -06:00
Samuel M Smith
99c6f5c6a9
Merge remote-tracking branch 'upstream/develop' into sam_dev1
2014-10-09 12:27:46 -06:00
Samuel M Smith
7bec8127dc
Changed how timeout works in RAETChannel
2014-10-09 12:26:56 -06:00
Steve Weber
382e74d784
fix opps
...
fix opps
2014-10-09 13:47:43 -04:00
Steve Weber
274afc8c11
cloud absent was missing not on has_instance
...
cloud absent was missing not on has_instance
2014-10-09 13:44:23 -04:00
Joseph Hall
c57c246126
Three-character function names
2014-10-09 11:37:59 -06:00
Steve Weber
16844a3987
small fixes
...
added `name_file = comps2[1][:-4]` because I figure if vmware adds a new file type its best to try and work with it.
vs giving the user an error that name_file is undefined.
from_cache=True, was already the default...
2014-10-09 13:24:43 -04:00
rallytime
2c513cf2bb
Remove print from tests
2014-10-09 10:33:34 -06:00
Mike Place
11ef20fdf5
Small doc fixes
2014-10-09 10:14:37 -06:00
Nicole Thomas
c6b9a04a5b
Merge pull request #16511 from techhat/lint
...
Lint fixes for #16495
2014-10-09 09:01:33 -06:00
Joseph Hall
f629aff547
Merge pull request #16485 from steverweber/cloud_state
...
use cloud.has_instance to cleanup some code
2014-10-09 08:30:01 -06:00
Joseph Hall
b7957aeb57
Merge pull request #16484 from steverweber/cloud_module
...
add some helpfull methods
2014-10-09 08:29:25 -06:00
Joseph Hall
4fa8e7f861
Lint fixes for #16495
2014-10-09 08:27:46 -06:00
Joseph Hall
ce9b1cddc0
Merge pull request #16495 from cachedout/alias_pillar_refresh
...
This has been driving me insane
2014-10-09 08:26:39 -06:00
Steve Weber
d82543a30c
lint fix and removed unused var
2014-10-09 09:50:13 -04:00
Steve Weber
2fda2a3033
lint fix
...
lint fix
2014-10-09 09:47:06 -04:00
Joseph Hall
10fc9d82b8
Merge pull request #16506 from eguven/fix-get-timezone-bug
...
strip data read from /etc/timezone
2014-10-09 07:06:19 -06:00
Eren Güven
44727e91e2
strip data read from /etc/timezone
2014-10-09 12:14:41 +02:00
Samuel M Smith
1c8bdb972c
Added parsing and extracting functions for raet formatted opts['master']
...
Still need to test
2014-10-08 17:36:57 -06:00
Mike Place
910323f26f
This has been driving me insane
2014-10-08 16:13:35 -06:00
Colton Myers
710795b3b3
Merge pull request #16492 from saltstack/2014.7
...
Merge forward 2014.7 into develop
2014-10-08 15:25:56 -06:00
Colton Myers
c559e7e6fb
Merge pull request #16491 from basepi/2014.1.12releasenotes2
...
Add 2014.1.12 release notes (2014.7 branch)
2014-10-08 15:24:46 -06:00
Colton Myers
5e25de90e9
Add 2014.1.12 release notes
2014-10-08 15:22:33 -06:00
Seth House
b0615f9bbf
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-08 14:40:32 -06:00
Steve Weber
fb3f5e6276
use cloud.has_instance to cleanup some code
...
use cloud.has_instance to cleanup some code
2014-10-08 16:04:51 -04:00
Steve Weber
ee057e610a
add some helpfull methods
...
get_instance is much more simple to get details on an instance because its offen not possible to know what the dict layout is inorder to get to the child hostname.
has_instance is nice to have when ensuring an instance is present or absent.
2014-10-08 16:00:00 -04:00
Colton Myers
ded7c1fc8a
Merge pull request #16438 from whiteinge/cmd_async-low-reformatting
...
Also format low data correct for the async RunnerClient calls
2014-10-08 13:58:20 -06:00
Colton Myers
01e61f1f58
Merge pull request #16469 from UtahDave/develop
...
Add ps.proc_info
2014-10-08 13:57:22 -06:00
Steve Weber
42c6a18ab7
list_nodes_min parse vm nodes for vm names.
...
list_nodes_min cant use get_registered_vms to get vm names directly... added some logic to clean that up.
parted vm create function into cleaner code.
2014-10-08 15:52:12 -04:00
Samuel Smith
98e2125c73
Merge pull request #16482 from SmithSamuelM/sam_dev1
...
Fixed typo in naming Deed classes for maint.py behaviors
2014-10-08 13:18:41 -06:00
Samuel M Smith
0b99d4198c
Merge remote-tracking branch 'upstream/develop' into sam_dev1
2014-10-08 13:16:01 -06:00
Samuel M Smith
e684faa993
Fixed typo in naming Deed classes for maint.py behaviors
2014-10-08 13:14:39 -06:00
Colton Myers
73b55c462e
Merge pull request #16461 from rallytime/fix_16408
...
Fix formatting error
2014-10-08 11:53:40 -06:00
Colton Myers
c2c05d49cf
Merge pull request #16449 from rallytime/fix_16448
...
Remove double import
2014-10-08 11:51:45 -06:00
Seth House
f0ec3729f1
Merge pull request #16474 from eliasp/develop-fix-pr-14101
...
Fix again what was supposed to be fixed in PR#14101.
2014-10-08 10:42:24 -06:00
Joseph Hall
d0ae927f10
Merge pull request #16475 from cachedout/issue_16472
...
Fix docs
2014-10-08 10:18:07 -06:00