Thomas S Hatch
0cbfb2e30a
Merge pull request #11148 from galet/ini-missing-rows
...
Fix ini_manage to preserve empty options
2014-03-12 09:29:37 -06:00
Mike Place
3c1db17931
Merge pull request #11165 from ranl/develop
...
fixing win_servermanager install/remove function
2014-03-12 06:51:47 -06:00
ranl
e069d55e97
Merge remote-tracking branch 'upstream/develop' into develop
2014-03-12 14:49:29 +02:00
ranl
8f08e2652c
fixing win_servermanager install/remove function
2014-03-12 14:48:49 +02:00
Pedro Algarvio
6708c7eac1
Merge pull request #11159 from StephenPCG/fix-returner-in-batch-mode
...
Pass '--return' settings in batch mode.
2014-03-12 11:05:44 +00:00
Zhang Cheng
618fb14158
Pass '--return' settings in batch mode.
2014-03-12 15:17:02 +08:00
Thomas S Hatch
7484308d14
Moved master and minion behaviors to core and normalized them
2014-03-11 23:20:48 -06:00
Thomas S Hatch
1c909c0ea9
Merge pull request #11155 from rallytime/mac_user_test
...
Mac user integration test
2014-03-11 23:17:03 -06:00
Thomas S Hatch
5a909c27ad
Add required CLI Example block
2014-03-11 23:13:13 -06:00
Thomas S Hatch
f4db34b64a
Fix exception in yid management
2014-03-11 23:11:51 -06:00
Thomas S Hatch
9973362d8d
gate worker tracker creation
2014-03-11 23:07:22 -06:00
Thomas S Hatch
0b8519c51e
no need to inbound twice
2014-03-11 23:04:19 -06:00
Thomas S Hatch
9e6b2dbeea
Add in the access keys needed by localfuncs
2014-03-11 22:57:33 -06:00
Thomas S Hatch
311dba60f9
more safely connect to the manor yard in raet events
2014-03-11 22:57:33 -06:00
Thomas S Hatch
dc57e8056e
Get workers to start
2014-03-11 22:57:33 -06:00
Thomas S Hatch
89c49c95b7
enter the setup frame before moving to the master udp frame
2014-03-11 22:57:33 -06:00
Joseph Hall
6545cc57dc
Merge pull request #11152 from dmyerscough/develop
...
check to see if existing partitions exist
2014-03-11 22:34:24 -06:00
Thomas S Hatch
6bd0b61d94
remove local cmd, the router sends them to the workers
2014-03-11 22:25:24 -06:00
rallytime
b9ea2d09f4
pylint fixes
2014-03-11 21:45:41 -06:00
Damian Myerscough
f9522dc5c1
PEP8
2014-03-11 18:21:31 -07:00
Damian Myerscough
9b3b7eb518
check to see if a partition exists
2014-03-11 18:18:43 -07:00
Michal Galet
5e99f1a60b
Fixing formatting in ini_manage_test.py.
2014-03-11 23:41:53 +01:00
Thomas S Hatch
f252a89815
Expose the worker tracker correctly from the datashare
2014-03-11 16:41:43 -06:00
Thomas S Hatch
6b20a969b1
Merge pull request #11145 from terminalmage/issue11050
...
Use --plugins to include plugin-provided repos
2014-03-11 16:35:53 -06:00
Michal Galet
99fcd43135
Fixing ini_manage module to preserve empty options. Added unit test for module to verify there are no regressions.
2014-03-11 23:35:01 +01:00
Thomas S Hatch
433e4b988f
Merge pull request #11146 from ze42/dev_blockreplace
...
file.blockreplace: fix typo endswith
2014-03-11 15:34:07 -06:00
rallytime
edfd0f4a99
Wrote a mac_user integration test
2014-03-11 15:26:16 -06:00
Adrien "ze" Urban
6eba21c787
file.blockreplace: fix typo endswith
2014-03-11 22:09:58 +01:00
Thomas S Hatch
ae91770db2
Merge pull request #11144 from techhat/pillar
...
Prevent endless recursion from external pillars
2014-03-11 14:06:40 -07:00
Thomas S Hatch
112542ca51
Merge pull request #11137 from ze42/dev_blockreplace
...
blockreplace - ensure newline before appending
2014-03-11 14:06:19 -07:00
Erik Johnson
b2efb50ac8
Use --plugins to include plugin-provided repos
...
This adds --plugins to several repoquery calls, allowing results from
plugin-provided repositories to be returned.
2014-03-11 16:05:05 -05:00
Joseph Hall
4d53b498d5
Prevent endless recursion from external pillars
2014-03-11 14:45:05 -06:00
Joseph Hall
68cce928ee
Merge pull request #11142 from gtmanfred/image_meta_data
...
[Nova] I cant type, flavor, not flvaor
2014-03-11 14:33:22 -06:00
Daniel Wallace
45fd1bdfaa
[Nova] I cant type, flavor, not flvaor
2014-03-11 15:30:35 -05:00
Joseph Hall
66325423fd
Merge pull request #11141 from CaptTofu/develop
...
Removed internal nomenclature for regions
2014-03-11 14:13:25 -06:00
CaptTofu
e2573d376a
Removed internal nomenclature for regions
2014-03-11 15:59:32 -04:00
Joseph Hall
f46a1292f8
Merge pull request #11140 from gtmanfred/image_meta_data
...
[Nova] apply _id to SaltNova too
2014-03-11 13:51:29 -06:00
Daniel Wallace
d34a2267db
[Nova] apply _id to SaltNova too
2014-03-11 14:49:25 -05:00
Thomas S Hatch
bae3cf69eb
Merge pull request #11127 from makinacorpus/cronfix2
...
cron: fix tests
2014-03-11 12:34:24 -07:00
Joseph Hall
9ac2f5699f
Merge pull request #11139 from gtmanfred/image_meta_data
...
Image meta data
2014-03-11 13:25:20 -06:00
Daniel Wallace
44eeae46e6
[Nova] unify _ids in nova module
2014-03-11 14:22:22 -05:00
Daniel Wallace
1a79cc8c42
[Nova] fix image_meta_delete
...
I apparently can't type and had put in image_meta_data instead of the
correct function when moving to SaltNova.
2014-03-11 14:17:01 -05:00
Thomas S Hatch
a1c0b60b15
Merge pull request #11136 from cvrebert/patch-2
...
fix typo: salt.config.{minion_conf=>minion_config}
2014-03-11 12:12:59 -07:00
Thomas S Hatch
6f9465faa7
Merge pull request #11134 from cvrebert/patch-1
...
cloud/clouds/lxc.py: fix typo in comment
2014-03-11 12:12:46 -07:00
Thomas S Hatch
204b76eb93
Merge pull request #11126 from cachedout/ssh_work
...
Ssh work
2014-03-11 12:09:48 -07:00
Thomas S Hatch
bdc303a2dd
Merge pull request #11124 from CaptTofu/develop
...
Added document for use of salt-cloud with HP Cloud 1.1
2014-03-11 12:09:12 -07:00
Chris Rebert
c2723d5906
fix typo: salt.config.{minion_conf=>minion_config}
...
************* Module salt.cloud.clouds.lxc
salt/cloud/clouds/lxc.py:70: [E1101(no-member), _minion_opts] Module 'salt.config' has no 'minion_conf' member
2014-03-11 12:07:47 -07:00
Chris Rebert
9f85e8c29d
cloud/clouds/lxc.py: fix typo in comment
2014-03-11 11:54:58 -07:00
Joseph Hall
c272d3900e
Merge pull request #11132 from hulu/clouds-nova
...
Avoid shadowing outer `client` name in salt.cloud.clouds.nova.destroy()
2014-03-11 12:40:24 -06:00
Joseph Hall
84b8077bee
Merge pull request #11131 from hulu/utils-event-typos
...
fix various typos in salt/utils/event.py
2014-03-11 12:39:07 -06:00
