Commit graph

5923 commits

Author SHA1 Message Date
Michael DeHaan
c2988dfdb0 Merge branch 'option-updates' of git://github.com/jlund/ansible into devel
Conflicts:
	bin/ansible-pull
2013-06-30 19:31:37 -04:00
Michael DeHaan
c9b6f0d0f2 Merge branch 'files_force' of git://github.com/rhaido/ansible into devel 2013-06-30 19:24:37 -04:00
Michael DeHaan
be5386f945 Merge remote branch 'origin' into devel 2013-06-30 19:24:24 -04:00
Michael DeHaan
8b592c9d4b Add some whitespace to script 2013-06-30 19:21:28 -04:00
Michael DeHaan
8f5c9aec47 Merge branch 'env-setup-shell-tweaks' of git://github.com/madduck/ansible into bash_hacking
Conflicts:
	hacking/env-setup
2013-06-30 19:20:27 -04:00
Michael DeHaan
2bbad5dae3 Merge pull request #3275 from madduck/implicit-negations
Enable negated patterns
2013-06-30 16:12:37 -07:00
Michael DeHaan
15bf8a8398 Merge pull request #3315 from madduck/fix-service-updatercd-changed
Let update-rc.d set changed flag properly
2013-06-30 16:09:39 -07:00
Michael DeHaan
39105dc853 Fix RST formatting in documentation (underline too short) 2013-06-30 19:01:06 -04:00
Michael DeHaan
7821473710 Fixup documentation YAML 2013-06-30 19:00:43 -04:00
Michael DeHaan
681696846a Styling: semicolon 2013-06-30 18:56:03 -04:00
Michael DeHaan
ecc2b6e742 Styling: deprecation 2013-06-30 18:55:45 -04:00
Michael DeHaan
2e63faf257 Styling: deprecation 2013-06-30 18:55:03 -04:00
Michael DeHaan
257d827c9e Styling: misc pep8 2013-06-30 18:54:32 -04:00
Michael DeHaan
bc7de7bf3f Styling: indentation 2013-06-30 18:53:55 -04:00
Michael DeHaan
0e51a1c0ea Styling: semicolon 2013-06-30 18:53:22 -04:00
Michael DeHaan
39834d854c Styling: trailing spaces 2013-06-30 18:52:57 -04:00
Michael DeHaan
fc8ffc1864 Styling: blank lines 2013-06-30 18:52:33 -04:00
Michael DeHaan
c7eb68e043 Styling: deprecation 2013-06-30 18:52:17 -04:00
Michael DeHaan
4827d1451e pep8: deprecation 2013-06-30 18:51:47 -04:00
Michael DeHaan
899ea4de82 Styling: indentation 2013-06-30 18:51:11 -04:00
Michael DeHaan
0b251d840b Styling: spacing 2013-06-30 18:51:00 -04:00
Michael DeHaan
ea2a665981 Styling: misc pep8 2013-06-30 18:50:40 -04:00
Michael DeHaan
f2fc185651 Styling: indentation 2013-06-30 18:49:49 -04:00
Michael DeHaan
82d51e6354 Semicolons must die 2013-06-30 18:49:17 -04:00
Michael DeHaan
75cadeebcb update changelog 2013-06-30 18:46:23 -04:00
Michael DeHaan
6dd93fa964 Some minor doc tweaks 2013-06-30 18:32:49 -04:00
Michael DeHaan
ee4d9b1516 Merge branch 'devel' of git://github.com/shirou/ansible into devel 2013-06-30 18:28:35 -04:00
Michael DeHaan
c265c761d0 Slight message tweak. 2013-06-30 18:27:15 -04:00
Michael DeHaan
e6adc2f066 Merge branch 'devel' of git://github.com/arturaz/ansible into devel 2013-06-30 18:25:33 -04:00
Michael DeHaan
29894737cf Merge pull request #3374 from jsmartin/bugfix
cloudformation: Fixed bug in module_fail. Consistent error handling.
2013-06-30 15:22:25 -07:00
Michael DeHaan
407edf097a Merge pull request #3386 from skorokithakis/feature/onlyifchanged
Add --only-if-changed option.
2013-06-30 14:23:44 -07:00
Michael DeHaan
213e74a44c Merge pull request #3298 from devo-ps/linode
Add Linode cloud support.
2013-06-30 14:22:07 -07:00
Stavros Korokithakis
53207ddbdf Add --only-if-changed option. 2013-07-01 00:20:58 +03:00
Michael DeHaan
1d1d30f338 Merge pull request #3357 from neomantra/devel
Add DigitalOcean inventory plugin
2013-06-30 14:20:21 -07:00
Michael DeHaan
f2e3a9a850 Merge pull request #3370 from y-p/PR_role_doc_enh
Add doc example of attaching tags to a role
2013-06-30 14:18:11 -07:00
Michael DeHaan
fa4313c7ee Merge pull request #3358 from aristanetworks/devel
initial arista module import
2013-06-30 14:17:47 -07:00
Michael DeHaan
146455fd0a Merge pull request #3375 from jhoekx/mandatory-filter
Add a mandatory jinja2 filter for use in templates.
2013-06-30 14:16:17 -07:00
Michael DeHaan
a501e94b63 Merge pull request #3364 from sergevanginderachter/lvol
lvol module: add support for multiple size formats
2013-06-30 14:15:55 -07:00
Michael DeHaan
8dfff02077 Merge pull request #3373 from exosite/devel
Added Linode inventory plugin
2013-06-30 14:14:48 -07:00
James Martin
7b825f72df Fixed bug in module_fail. Consistent error handling. Adding comments. Removal of unused variable. Removed unecessary wait_for option. was never been used to begin with. Trim down the stack_outputs. Don't need to include stack name and region since they are already required parameters. Rollback supported in status operations. Using dict when possible. 2013-06-30 16:59:50 -04:00
Michael DeHaan
6d5ac43dcb Merge pull request #3368 from j2sol/wait_for_improv
Improvements to wait_for module
2013-06-30 09:20:12 -07:00
Michael DeHaan
88c907af90 Merge pull request #3340 from bpennypacker/stat
get file/path facts via 'stat'
2013-06-30 09:19:06 -07:00
Michael DeHaan
71b9be509c Merge pull request #3347 from AscendLearning/irc-with-pass
Added a provision for passing a server password to IRC
2013-06-30 09:17:19 -07:00
Michael DeHaan
a8e8a9583b Merge pull request #3336 from lorin/htpasswd
Add htpasswd module
2013-06-30 09:15:50 -07:00
Michael DeHaan
98e7eaf07a Merge pull request #3316 from dsedivec/devel
expanduser on each component of plug-in paths
2013-06-30 09:12:15 -07:00
Michael DeHaan
e4e3c239c7 Merge pull request #3385 from stoned/find_plugin-cleanup
Remove redundant call to _get_path() in PluginLoader.find_plugin()
2013-06-30 08:29:09 -07:00
Stoned Elipot
b7f89837bb Remove redundant call to _get_path() in PluginLoader.find_plugin() 2013-06-30 16:38:26 +02:00
Peter Sprygada
037a6d497b moved modules to net_infrastructure 2013-06-29 19:59:14 -04:00
Michael DeHaan
d61a65ff08 Merge pull request #3377 from kjkuan/easy_install_fix
Fix the issue of easy_install ignoring virtualenv_site_packages=yes.
2013-06-29 14:21:44 -07:00
Jack Kuan
a07324c590 Fix the issue of easy_install ignoring virtualenv_site_packages=yes. 2013-06-29 17:03:12 -04:00