Commit Graph

51383 Commits

Author SHA1 Message Date
Joseph Hall
2a4ef7ce3b Updates to Stormpath as per Randall Degges 2015-04-22 15:59:09 -06:00
Joseph Hall
3b17858052 Merge pull request #22837 from nmadhok/vmware-cloud-driver
Making vmware cloud driver Python3 compatible and other additions
2015-04-19 15:57:43 -06:00
Nitin Madhok
cbe860dab2 Making vmware-cloud driver python3 compatible 2015-04-19 13:33:34 -04:00
Nitin Madhok
2c2705f7a9 Rename _set_network_adapter_mapping to _set_network_adapter_mapping_helper 2015-04-19 12:13:51 -04:00
Nitin Madhok
1b0f2481f7 Combining duplicate code for network adapter mapping in a single helper function 2015-04-19 12:08:00 -04:00
Joseph Hall
46c391bd87 Merge pull request #22812 from nmadhok/vmware-cloud-driver
Added functions rescan_all_hbas() & rescan_hba() in vmware salt cloud driver
2015-04-19 07:28:57 -06:00
Nitin Madhok
64e527c4dc Adding ability to modify/create SCSI adapters #22364 2015-04-18 17:09:11 -04:00
Justin Findlay
3e21e43915 Merge pull request #22824 from favadi/xmpp-multi
Add xmpp.send_msg_multi state/module
2015-04-18 10:54:55 -06:00
Nitin Madhok
5da9ee1bff Better error hangling 2015-04-18 09:41:59 -04:00
Diep Pham
83c21f91d0 add xmpp.send_msg_multi state 2015-04-18 11:14:51 +07:00
Diep Pham
b57608071c add xmpp.send_msg_multi module 2015-04-18 11:14:47 +07:00
Thomas S Hatch
1cd2996d45 Merge pull request #22806 from jfindlay/fix_grain_whereis
use cmd.run_all instead of cmd.run_stdout
2015-04-17 18:19:21 -06:00
Nicole Thomas
dcd9e16a5c Merge pull request #22784 from techhat/stormpath
Adding and updating Stormpath modules
2015-04-17 16:50:25 -06:00
Joseph Hall
514dd38148 Python 3 compat 2015-04-17 16:48:58 -06:00
Nitin Madhok
67d7873e80 syntax fix 2015-04-17 18:36:07 -04:00
Justin Findlay
6a554d5607 Merge pull request #22805 from rallytime/all-the-pylint
Another pylint fix for develop
2015-04-17 15:21:49 -06:00
Nitin Madhok
364bc2594c Combine rescan_hba() and rescan_all_hbas() 2015-04-17 17:12:10 -04:00
Joseph Hall
54dbf9b444 Specify which version Stormpath was added to 2015-04-17 15:11:38 -06:00
Nitin Madhok
37b4d09ff2 Merge pull request #4 from mpmoers/vmware-cloud-driver
Added functions rescan_all_hbas_on_host & rescan_hba_on_host
2015-04-17 16:46:07 -04:00
Matt Moersen
27a686928c Updated function names and spaceing
Fixed spacing and grammer. Formatted documentation for readability.
2015-04-17 16:44:54 -04:00
Matt Moersen
d01b0d6826 updated spacing issues and example usage 2015-04-17 16:27:07 -04:00
Joseph Hall
dbbd6bf1f7 Merge pull request #22788 from nmadhok/vmware-cloud-driver
Speeding up list_nodes_select() and few other tweaks in VMware cloud driver
2015-04-17 14:05:56 -06:00
Matt Moersen
0fdd5f884c changed references to vim.HostSystem in rescan functions
Reference to vim.HostSystem not vim.host,
changed rescan function names to be more specific,
changed rescan methods to functions instead of actions
2015-04-17 16:05:48 -04:00
Justin Findlay
b4a86add44 use cmd.run_all instead of cmd.run_stdout
Fixes #22574.
2015-04-17 13:54:58 -06:00
rallytime
9e83d85fd8 Another pylint fix for develop 2015-04-17 13:48:55 -06:00
Matt Moersen
47fc49ab14 Merge branch 'vmware-cloud-driver' of https://github.com/nmadhok/salt into vmware-cloud-driver 2015-04-17 15:28:04 -04:00
Justin Findlay
1097d2587a Merge pull request #22798 from rallytime/pylint-develop
Python 3 compat fixes for develop
2015-04-17 13:14:45 -06:00
Justin Findlay
81d4d906c4 Merge pull request #22799 from nmadhok/develop
Fixes #22792
2015-04-17 13:13:04 -06:00
Colton Myers
fc62a37e05 Merge pull request #22801 from rallytime/release_notes_develop
Add 2014.7.5 release notes to develop
2015-04-17 12:54:59 -06:00
rallytime
36b54ee79b Remove extra line 2015-04-17 12:53:58 -06:00
rallytime
93a858c591 Added release note for 2014.7.5 release 2015-04-17 12:53:50 -06:00
Justin Findlay
b88f7b06f1 Merge pull request #22793 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-17 12:49:42 -06:00
Justin Findlay
cfb7e97140 Merge pull request #22789 from julienlavergne/gitignore
added recursive for ignored vagrant project files
2015-04-17 12:49:17 -06:00
Justin Findlay
890c89cfd6 Merge pull request #22785 from junckritter/cloud-gce-disks
Allow additional parameters for GCE cloud profile
2015-04-17 12:43:46 -06:00
Nitin Madhok
faa2fd7e4e Lint 2015-04-17 14:39:59 -04:00
Nicole Thomas
d6ab56b88d Merge pull request #22783 from eliasp/develop-states.group.present-typo
Fixed typo/grammar.
2015-04-17 12:05:10 -06:00
rallytime
1e4b93dec9 Python 3 compat fixes for develop 2015-04-17 12:00:01 -06:00
Nitin Madhok
964df532cc Fixes #22792 2015-04-17 13:57:37 -04:00
Colton Myers
279e98aa6f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/loader.py
2015-04-17 11:37:58 -06:00
Nitin Madhok
59d8faab26 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-04-17 13:05:16 -04:00
Nitin Madhok
950fbce22e Adding terminate() action to be able to immediately power off the VM 2015-04-17 12:58:35 -04:00
Joseph Hall
9c73abe174 Removing unused import 2015-04-17 10:52:08 -06:00
Julien Lavergne
1c91622fa6 added recursive ignored vagrant project files 2015-04-17 18:51:26 +02:00
Nitin Madhok
a0dde74240 Speeding up list_nodes_select() and few other tweaks 2015-04-17 12:45:17 -04:00
Matt Moersen
3d7f26d437 added function rescanHba
rescans a specific HBA on a host
2015-04-17 12:36:23 -04:00
Matt Moersen
e0b72395c5 fixed syntax errors 2015-04-17 11:52:20 -04:00
Matt Moersen
b8ce68e180 added function rescanAllHba
Function performs a rescan on all HBA’s on a specified host.
2015-04-17 11:48:38 -04:00
Joseph Hall
f9a38ce49d Linting 2015-04-17 09:30:28 -06:00
Thomas S Hatch
871cdd72df Merge pull request #22781 from eliasp/develop.pillar_ldap-doc-fixes
develop.pillar ldap doc fixes
2015-04-17 09:06:47 -06:00
Thomas S Hatch
e4f7da9946 Merge pull request #22773 from analogbyte/develop
smtp module: make multiple recipients work as expected
2015-04-17 08:43:39 -06:00