Seth House
bdfb589621
Merge pull request #23276 from whiteinge/missing-docs-pt-deux
...
Fix the build process for a few empty docs
2015-05-01 14:28:44 -06:00
Seth House
d844ca5112
Removed docs for ext_pillar module that is a wip
2015-05-01 14:24:01 -06:00
Seth House
6be273d5f3
Removed stormpath_mod and linodepy docs; these were renamed
2015-05-01 14:24:00 -06:00
Joseph Hall
0c53340e9d
Merge pull request #23266 from nmadhok/bug-fix-vmware
...
Fixing issues with VMware cloud driver create function
2015-05-01 14:16:26 -06:00
Seth House
cda915bcd4
Remove fsutils module documentation
...
This module was moved to the utils folder in #17883 .
2015-05-01 14:13:59 -06:00
Seth House
901fa33440
Mocked tornado.httputil
...
Refs #22820
2015-05-01 13:57:43 -06:00
Nitin Madhok
846519cc5f
Fixing issues with VMware cloud driver create function Fixes #23262 #23264
2015-05-01 13:43:59 -04:00
Nicole Thomas
b76807addc
Merge pull request #23260 from jtand/locales_pylint
...
Locales pylint
2015-05-01 10:36:42 -07:00
Justin
2defe02c88
Fixed pylint error in /salt/utils/locales.py
2015-05-01 10:32:29 -06:00
Justin
922f1f38a4
Fixed pylint error in /salt/utils/locales.py
2015-05-01 10:30:22 -06:00
Joseph Hall
4b836e0b17
Merge pull request #23251 from nmadhok/vmware-portgroup
...
Adding support to be able to specify distributed virtual port group or standard switch network upon VM creation
2015-05-01 09:02:25 -06:00
Thomas S Hatch
5188d6cbf7
Merge pull request #23235 from techhat/tornadoclient
...
Add tornado to http.query, and make it the default
2015-04-30 19:42:30 -06:00
Thomas S Hatch
3e6823cebf
Merge pull request #23234 from nmadhok/vmware-cloud-driver
...
Adding reboot_host() to be able to reboot a host system
2015-04-30 19:41:14 -06:00
Thomas S Hatch
cad5d77b96
Merge pull request #23225 from skizunov/develop
...
Fix engines on Windows
2015-04-30 19:40:53 -06:00
Nitin Madhok
dc7903b110
Adding support to be able to add distributed virtual portgroup to vm upon creation
2015-04-30 21:34:31 -04:00
Justin Findlay
17f32d137f
Merge pull request #23238 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-04-30 19:31:40 -06:00
Justin Findlay
7e58b06d89
Merge pull request #23248 from nmadhok/patch-vmware-driver
...
Making sure that the key exists in dict and doesn't fail if devices have not been specified
2015-04-30 19:22:20 -06:00
Justin Findlay
e1f150f5eb
Merge pull request #23229 from jtand/boto_pylint
...
Boto pylint
2015-04-30 18:03:39 -06:00
Nitin Madhok
ee84650848
Making sure that the key exists in dict Fixes #23247
2015-04-30 19:45:41 -04:00
Justin
1a49ecfd16
Last pylint fix...
2015-04-30 15:41:07 -06:00
Joseph Hall
49baddb997
Linting
2015-04-30 14:53:00 -06:00
Colton Myers
94ea3b7357
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
2015-04-30 14:23:05 -06:00
Joseph Hall
3dea1e98a1
Add tornado to http.query, and make it the default
2015-04-30 14:07:51 -06:00
Nitin Madhok
edfce004c4
Adding reboot_host() to be able to reboot a host system
2015-04-30 15:50:08 -04:00
Mike Place
92d7fcfff3
Merge pull request #23230 from cachedout/swarm_tcp
...
Fix bug preventing minionswarm from working with tcp transport
2015-04-30 12:49:45 -06:00
Mike Place
d0eda05f4d
Fix bug preventing minionswarm from working with tcp transport
2015-04-30 12:49:16 -06:00
Justin
941f611109
Fixed pylint errors
2015-04-30 11:06:55 -06:00
Sergey Kizunov
19320caff7
Fix engines on Windows
...
Function references cannot be pickled. When spawning processes on
Windows, pickling is required. Due to this, on Windows, don't pass
function references as arguments to the child process and instead
calculate them inside the child process.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-04-30 11:06:13 -05:00
Thomas S Hatch
6e18810745
Merge pull request #23209 from jayeshka/disk-states-unit-test
...
adding states/disk unit test case
2015-04-30 08:30:43 -07:00
Thomas S Hatch
6a1e86efce
Merge pull request #23208 from jayeshka/eselect-states-unit-test
...
adding states/eselect unit test case
2015-04-30 08:30:33 -07:00
Thomas S Hatch
6016e00eaf
Merge pull request #23207 from jayeshka/drac-states-unit-test
...
adding states/drac unit test case
2015-04-30 08:30:18 -07:00
Thomas S Hatch
365c16b901
Merge pull request #23206 from jayeshka/composer-states-unit-test
...
adding states/composer unit test case
2015-04-30 08:30:02 -07:00
Thomas S Hatch
9360af2afc
Merge pull request #23205 from jayeshka/debconfmod-states-unit-test
...
adding states/debconfmod unit test case
2015-04-30 08:29:46 -07:00
Thomas S Hatch
1ae9dcb71c
Merge pull request #22948 from jacksontj/develop
...
Req channel singletons
2015-04-30 08:24:22 -07:00
Thomas S Hatch
e608c56796
Merge pull request #23204 from jayeshka/ddns-states-unit-test
...
adding states/ddns unit test case
2015-04-30 08:23:43 -07:00
Thomas S Hatch
de635ce2f2
Merge pull request #23202 from tsaridas/boto_rds_replica
...
Test modes for boto states rds/elb
2015-04-30 08:23:31 -07:00
Thomas S Hatch
55285c89b3
Merge pull request #23199 from ykomatsu/aptpkg
...
Fix wrong number of arguments
2015-04-30 08:23:11 -07:00
Thomas S Hatch
f044678db9
Merge pull request #23197 from nmadhok/vmware-cloud-driver
...
VMware cloud driver additions
2015-04-30 08:22:51 -07:00
Thomas S Hatch
46b7938d54
Merge pull request #23178 from jfindlay/boto_version
...
fix incorrect boto_vpc state versionaddeds
2015-04-30 08:22:25 -07:00
Mike Place
d5a326ba63
Merge pull request #23203 from tsaridas/boto_iam_fix
...
Boto iam fix
2015-04-30 09:22:11 -06:00
Thomas S Hatch
4fabf465ff
Merge pull request #23174 from jfindlay/locale_utils
...
move locale utils to separate module
2015-04-30 08:22:00 -07:00
Thomas S Hatch
fd6448ab94
Merge pull request #23171 from skizunov/develop
...
Bugfix: 'clean_proc_dir' is broken
2015-04-30 08:21:32 -07:00
Thomas S Hatch
6c511beca1
Merge pull request #23219 from joehealy/debian_remove_debian_dir
...
Removed debian dir as only likely to cause confusion.
2015-04-30 08:20:41 -07:00
Thomas S Hatch
5f75b87224
Merge pull request #23217 from ykomatsu/http
...
Fix wrong namespaces
2015-04-30 08:20:08 -07:00
Thomas S Hatch
31de5b5932
Merge pull request #23216 from joehealy/debian_doc_update
...
Clean up of docs following jessie
2015-04-30 08:15:29 -07:00
Thomas S Hatch
48bdbedf83
Merge pull request #23212 from alexandrsushko/fix-23210
...
Fix for grain virtual in lxc-libvirt
2015-04-30 08:15:19 -07:00
Joe Healy
d4a41a7d6a
Removed debian dir as only likely to cause confusion.
...
This was only working properly on lucid and lucid has now
reached eol. Other releases of debian/ubuntu are best packaged
from the packaging repo at http://anonscm.debian.org/cgit/pkg-salt/salt.git
2015-04-30 23:56:06 +10:00
Joe Healy
f791a2c1e6
Clean up of docs following jessie
2015-04-30 23:48:32 +10:00
Yoshito Komatsu
48cc60b11c
Fix wrong namespaces
2015-04-30 22:37:06 +09:00
Alexandr Sushko
55b0663e53
Fix for grain virtual in lxc-libvirt
...
Fixes #23210
Fixes #15846
2015-04-30 13:31:24 +03:00
