Commit Graph

63694 Commits

Author SHA1 Message Date
Kris Raney
85d59865a6 Merge branch 'develop' into boto_iot 2015-12-28 13:45:35 -06:00
Mike Place
d8e1663ef1 Merge pull request #30031 from deuscapturus/patch-6
Update index.rst
2015-12-28 12:39:17 -07:00
Nicole Thomas
548d887510 Merge pull request #30003 from marnovdm/develop
Adds thin provisioning support for new hard disks in VMware driver
2015-12-28 12:08:38 -07:00
Marno van der Molen
35bd10c5ba Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration 2015-12-28 19:28:07 +01:00
Theodore Cowan
aa80bd2700 Update index.rst
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
2015-12-28 10:47:40 -07:00
Thomas S Hatch
46471d83a7 Merge pull request #29999 from alprs/feature-require_without_state_type
[WIP] requisites without explicitly providing the state module
2015-12-28 10:30:10 -07:00
Nicole Thomas
0beb39c3ac Merge pull request #29995 from ruxandraburtica/propagate-correct-location
Location from profiles not correctly set
2015-12-28 10:04:24 -07:00
Mike Place
92554d9dd8 Merge pull request #29963 from whiteinge/doc-reactor-worker-pool
Update Reactor docs with info on execution scope
2015-12-28 08:55:53 -07:00
Mike Place
07b59daab4 Merge pull request #30002 from bmcorser/patch-1
What I ended up using to debug CherryPy SSE
2015-12-28 08:53:32 -07:00
Mike Place
1ffae15454 Merge pull request #30017 from alprs/fix-alternatives_install
Change how alternatives states check for installed
2015-12-28 08:52:51 -07:00
Mike Place
e596ee5114 Merge pull request #29988 from hyn-salt/patch-2
Update osxdesktop.py virt error message
2015-12-28 08:40:59 -07:00
Mike Place
234bb14ceb Merge pull request #29987 from pass-by-value/salt_cloud_out_file
Make sure output file works for salt cloud
2015-12-28 08:40:36 -07:00
Mike Place
6960afc13d Merge pull request #29989 from zenion/patch-1
Fix CLI Example for file.line inaccuracy
2015-12-28 08:40:02 -07:00
Mike Place
8cb4c633bf Merge pull request #29990 from shortdudey123/fix_chef_loglocation
Fix chef logfile default arg value
2015-12-28 08:36:49 -07:00
Mike Place
0d1e422a8d Merge pull request #29996 from dr4Ke/fix_test_state_traceback_with_listen
fix test state traceback with 'listen'
2015-12-28 08:34:59 -07:00
Mike Place
2f04d2bec6 Merge pull request #30004 from serge-p/patch-8
Update pw_user.py
2015-12-28 08:34:06 -07:00
Mike Place
8391277ea1 Merge pull request #29997 from sjorge/doc-fixes
small doc fix for salt.states.zpool
2015-12-28 08:33:17 -07:00
Mike Place
ddb1646417 Merge pull request #30000 from abednarik/virtual_ret_ldapmod_module
modules.ldapmod: __virtual__ return err msg.
2015-12-28 08:33:03 -07:00
Mike Place
930087e23c Merge pull request #30001 from abednarik/virtual_ret_linux_ip_module
modules.linux_ip: __virtual__ return err msg.
2015-12-28 08:32:44 -07:00
Mike Place
ae66651184 Merge pull request #30005 from serge-p/patch-9
Update pw_group.py
2015-12-28 08:31:40 -07:00
Mike Place
76a8f71a0d Merge pull request #30009 from abednarik/virtual_ret_netbsd_sysctl_module
modules.netbsd_sysctl: __virtual__ return err msg.
2015-12-28 08:30:39 -07:00
Mike Place
5889daf19c Merge pull request #30010 from abednarik/virtual_ret_nova_module
modules.nove: __virtual__ return err msg.
2015-12-28 08:29:38 -07:00
Mike Place
57ea09e1a7 Merge pull request #30011 from abednarik/virtual_ret_nspawn_module
modules.nspawn: __virtual__ return err msg.
2015-12-28 08:29:24 -07:00
Mike Place
6112c0b513 Merge pull request #30012 from abednarik/virtual_ret_omapi_module
modules.omapi: __virtual__ return err msg.
2015-12-28 08:29:12 -07:00
Mike Place
bd837feedc Merge pull request #30021 from akissa/fix-typo-in-pillar-mysql
fix spelling typo in pillar mysql
2015-12-28 08:22:38 -07:00
Mike Place
1a114658ba Merge pull request #30023 from abednarik/virtual_ret_gpg_module
modules.gpg: __virtual__ return err msg.
2015-12-28 08:22:03 -07:00
Mike Place
d1363ba2de Merge pull request #30024 from abednarik/virtual_ret_netaddress_module
modules.netaddress: __virtual__ return err msg.
2015-12-28 08:21:57 -07:00
Mike Place
2496a05a39 Merge pull request #30027 from mephi42/osarch-rpm-redhat
Determine osarch using rpm on all RedHat derivatives
2015-12-28 08:20:43 -07:00
mephi42
c557008e24 Determine osarch using rpm on all RedHat derivatives 2015-12-28 12:59:09 +03:00
abednarik
3582be2db3 modules.netaddress: __virtual__ return err msg.
Updated message when netaddr library is not installed.
2015-12-27 19:50:32 -03:00
abednarik
32d29c7fd0 modules.gpg: __virtual__ return err msg.
Updated message when gpg binary is not in the path.
2015-12-27 19:44:59 -03:00
Andrew Colin Kissa
e1473c5f6a fix spelling typo in pillar mysql 2015-12-27 11:31:02 +02:00
Andreas Lutro
4c9d893f98 change how alternatives states check for installed 2015-12-26 22:48:29 +01:00
abednarik
c3dc91d48c modules.omapi: __virtual__ return err msg.
Updated return message in virtual when pypureomapi python library is not available..
2015-12-26 11:36:38 -03:00
abednarik
396755d8ee modules.nspawn: __virtual__ return err msg.
Updated return message in virtual when system was not booted with systemd.
2015-12-26 11:31:25 -03:00
abednarik
1cd4f04ee7 modules.nove: __virtual__ return err msg.
Updated return message in virtual when nove is not installed.
2015-12-25 20:37:32 -03:00
abednarik
7e11396cbb modules.netbsd_sysctl: __virtual__ return err msg.
Updated return message in virtual when system is not NetBSD.
2015-12-25 20:31:19 -03:00
Sergey Paramonov
33c230afda Update pw_group.py
adding support for DragonflyBSD into pw_group.py
2015-12-24 13:06:03 -05:00
Sergey Paramonov
e798c06fd8 Update pw_user.py
adding pw_user module support for DragonFly BSD
2015-12-24 13:01:09 -05:00
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Marno
e12cb0458b Fix copy/paste error 2015-12-24 17:20:02 +01:00
Marno
1095598070 configurable thin_provision option 2015-12-24 17:19:01 +01:00
Marno
f8e9064062 Add new hard disks as thin provisioned 2015-12-24 17:04:40 +01:00
B M Corser
71a79beca2 Web editor isn't vim :) 2015-12-24 15:18:03 +00:00
B M Corser
e18887550c What I ended up using to debug CherryPy SSE
Previous example didn't parse the JSON out
2015-12-24 15:17:16 +00:00
abednarik
73f0564bce modules.linux_ip: __virtual__ return err msg.
Added message when return False if system is not supported or ip binary is not in the path.
2015-12-24 09:37:48 -03:00
Andreas Lutro
03ceaf103b add documentation about omitting state modules in requisites 2015-12-24 13:07:44 +01:00
abednarik
f75a4530d5 modules.ldapmod: __virtual__ return err msg.
Added message when return False if ldap config is not set.
2015-12-24 09:02:26 -03:00
Andreas Lutro
0419ed6b3e check for id requisites in check_requisites 2015-12-24 11:55:22 +01:00
Andreas Lutro
c9d59e3d85 initial attempt at requires with id: 2015-12-24 11:43:45 +01:00