cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
6792 commits 47 branches 390 tags 440 MiB
Commit graph

647 commits

Author SHA1 Message Date
Toshio Kuratomi
170457413d Cleanup the old apt compatibility changes 2014-12-25 00:25:02 -08:00
fabios
a08165ca2e use low-level apt_pkg.Package 2014-12-24 17:55:44 -05:00
FabioBatSilva
55b85ddc46 fix compatibility issues with python-apt < 0.7.9 2014-12-24 10:26:59 -05:00
Dale Bewley
449ced1efa use state parameter in examples 2014-12-04 17:31:35 -08:00
Sebastian Gerhards
cda40bc33c rhn_register: add support for profilename 2014-12-02 11:33:10 +01:00
René Moser
24137a3c6c yum: add update_cache option 
Yum does not always update to latest package version unless metadata cache has expired. By runing yum makecache, we ensure the metadata cache has been updated.

Signed-off-by: René Moser <mail@renemoser.net>
 2014-12-01 18:07:50 +01:00
Jim Patterson
102167f22e Correct check mode for pip in virtualenv. 
Fix #412.  Check mode was always returning changed=True for pip
when the target was in a virtualenv.  The code now uses the normal
tests for determining if change status.
 2014-11-30 19:31:09 -05:00
Toshio Kuratomi
195e7c5a13 Merge commit '383ecdb' into devel 2014-11-18 13:09:29 -08:00
Toshio Kuratomi
383ecdb50b Correct variable name 2014-11-18 13:08:26 -08:00
Pierre-Louis Bonicoli
9ca27eedcc apt_repository: fix file mode 
'set_mode_if_different' method should be called on dest filename and after
'atomic_move' method
 2014-11-16 01:13:29 +01:00
Henry Finucane
ce02d59651 If force=true, ignore python-apt's advice 
This lets you downgrade packages, for instance.
 2014-11-14 16:27:20 -08:00
Henry Finucane
4558ed6925 dpkg does not take a --force-yes option 2014-11-14 16:24:08 -08:00
Toshio Kuratomi
fb4854ebcb Fix retrieval of package version in apt module 2014-11-14 10:01:30 -08:00
Toshio Kuratomi
c389cd671f Documentation update for apt version wildcards from bryanlarsen 2014-11-14 09:43:38 -08:00
Toshio Kuratomi
e1ecc5ca8e Update package_status and install to account for wildcarded versions. 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
ccedf0dd40 Decide to allow pkgname and version wildcards so that things like libxml2*=2.9* would work 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
bc18c9dc78 Cache pkg name list so we don't recreate the list for every package 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
10fd0f7073 Just make things a little more readable 2014-11-14 07:45:56 -08:00
Toshio Kuratomi
885b60f31f if __name__ does work with ansible modules 2014-11-14 07:45:55 -08:00
Michael Vogt
f475769d3a add apt unittest 2014-11-14 07:45:55 -08:00
Michael Vogt
76fc436b08 Allow foo=1.0* like expressions in apt 2014-11-14 07:45:55 -08:00
Robert Estelle
4dd099fe7a Remove incorrect executable permissions. 2014-11-13 18:08:48 -05:00
Brian Coca
a13c568310 corrected comparisson which had accidentally chaned in previous fixes 2014-11-12 17:16:02 -05:00
Brian Coca
bbebdefacb better handling of deprecated aliases 2014-11-12 17:01:14 -05:00
Jonathan Mainguy
ae1af202e8 Fixes --enable-repo for Oracle Linux 2014-11-12 16:56:45 -05:00
Brian Coca
5356ccbb35 make sure 'present' is fully equivalente of 'installed' and remove installed from 
feedback in favoer of 'present'
 2014-11-12 15:46:36 -05:00
James Cammarata
6db6cd219e Use new prompt detection in run_command to detect aptitude prompts 
Also adds flags to aptitude command when force=yes is used, in order
to bypass the prompts given for untrusted packages.

Fixes #31
 2014-11-10 23:45:27 -06:00
Michael DeHaan
3ed1378067 Some more module categorization. 2014-11-04 17:23:22 -05:00
Lorin Hochstein
3ab26c538b apt_key: add keyserver example to docs 2014-10-03 15:10:45 -04:00
Michael DeHaan
385a037cd6 package files 2014-09-26 11:05:47 -04:00
Michael DeHaan
c8e1a2077e file extensions! 2014-09-26 10:37:56 -04:00
Michael DeHaan
417309a626 Restructuring. 2014-09-26 10:13:26 -04:00
Michael DeHaan
73123b69fa Move modules into subdirectory. 2014-09-26 09:23:50 -04:00
James Pharaoh
27ccd01db4 add LANG=C to apt module so the string matches on the output always match 2014-09-18 20:56:21 +02:00
Bruno BAILLUET
8f2dae1964 Fix a typo on is_update call inside latest function 2014-09-12 18:19:00 +02:00
Michael DeHaan
318b09e940 Merge pull request #8853 from kvar/devel 
zypper: handle lists of packages efficiently
 2014-09-11 17:30:21 -04:00
Alexander Gubin
e8b3a028ea zypper_repository: Remove trailing "/". Identifies "logically" identical repos. 
Example: ftp://download.nvidia.com/opensuse/12.2 == ftp://download.nvidia.com/opensuse/12.2/
 2014-09-09 09:22:08 +02:00
James Cammarata
8265c08082 Merge pull request #8888 from alxgu/fix_zypp_repo_absent 
Fix for #8886. Correct state=absent for statements without name/alias.
 2014-09-04 11:02:09 -05:00
Alexander Gubin
8bdd5240aa Fix for #8886. Correct state=absent for statements without name/alias. 2014-09-04 14:35:39 +02:00
Kristofor Varhus
8d694964d2 fix typo in zypper module (requiered -> required) 2014-09-03 13:03:59 -04:00
James Cammarata
1d5a4be997 Adding ignore_scripts option to the argument_spec for npm 2014-09-03 10:24:09 -05:00
James Cammarata
72b92a4b0e Fixing new ignore scripts option logic and name for the npm module 2014-09-02 12:13:15 -05:00
James Cammarata
cf320adb43 Merge branch 'npm-ignore-scripts' of https://github.com/tkellen/ansible into tkellen-npm-ignore-scripts 2014-09-02 12:09:31 -05:00
Kristofor Varhus
e64591bfbe zypper: handle lists of packages efficiently 2014-09-02 09:38:30 -04:00
Tyler Kellen
b0dd339450 add support for --ignore-scripts when using npm 2014-08-29 16:06:10 -04:00
Dustin C. Hatch
7b8501424b portage: Add support for --changed-use 
The `--changed-use` flag is an improvement over `--newuse` because it
does not trigger rebuilds for USE flag changes that would not affect the
installed package. Its use is generally recommended over `--newuse`.

Signed-off-by: Dustin C. Hatch <dustin@hatch.name>
 2014-08-27 08:02:03 -05:00
rghe
96263dbd2d fixes #8626 by reverting 0d8b81cd 2014-08-14 18:10:58 +02:00
Marcus Jaschen
689d519b93 Homebrew module: Added + and . characters to the package name regex. 
Solves installation failures for packages like `bonnie++` or
`virtualhost.sh` as described in #8413.
 2014-08-13 22:31:03 +02:00
Michael DeHaan
44b5936875 Merge pull request #8544 from Tenzer/faster-apt_repository 
apt_repository: Check if key already exists before adding it
 2014-08-11 08:09:19 -04:00
Jeppe Toustrup
3efa2b6249 apt_repository: Check if key already exists before trying to add it for a speed increase 2014-08-11 11:57:23 +02:00
Michael DeHaan
4a3fcf7d1c Merge pull request #6701 from carlanton/pr/pip_check_fix2 
Make pip dry run work better for the common case
 2014-08-08 14:53:25 -04:00
Michael DeHaan
30dcd9aa2f Update version_added info. 2014-08-08 14:46:49 -04:00
Michael DeHaan
d7db973e6b Merge pull request #7476 from geschke/devel 
implemented the missing "command" option, defaults to "install"...
 2014-08-08 14:47:14 -04:00
Michael DeHaan
65dc120d44 Update version_added info. 2014-08-08 14:14:12 -04:00
Karol Hosiawa
0114058947 Add validate_certs option to apt_repository 2014-08-08 14:14:12 -04:00
Michael DeHaan
c8dbca074b Update version_added 2014-08-08 13:42:22 -04:00
alxgu
069ec8f68d Update zypper 
Modified "Version_added"
 2014-08-08 13:42:22 -04:00
alxgu
c985d72df6 Changed version_added 2014-08-08 13:42:22 -04:00
Alexander Gubin
cbef749bdc Added --no-recommends option 2014-08-08 13:42:22 -04:00
Michael DeHaan
185d5a6221 Merge branch 'spelling' of git://github.com/cgar/ansible into devel 
Conflicts:
	docsite/rst/guide_rax.rst
	plugins/callbacks/mail.py
 2014-08-08 13:28:45 -04:00
Christophe Biocca
4f43607c9b Ensure named packages not in top level are marked as missing. 2014-08-06 10:52:58 -04:00
Jonathan Mainguy
e7cbbd8b73 Removed max 8192 bytes, fixes #8424 2014-08-04 20:55:49 -04:00
ebargtuo
e6090d2f9e Fix a typo in gem module documentation 2014-08-03 14:52:24 +02:00
Michael DeHaan
f03d4e5bc7 Merge pull request #7949 from hacosta/apt_key 
Check at most 16 characters of the key. Fixes #7936
 2014-07-28 11:30:27 -04:00
Michael DeHaan
634952d15b Merge pull request #7969 from dedalusj/devel 
Fixed bug with environment path for homebrew_cask
 2014-07-28 10:49:04 -04:00
James Cammarata
67899d95fd Merge pull request #8292 from jimi-c/issue_7863_deb_with_items 
Allow deb package installation via with_items
 2014-07-25 10:46:37 -05:00
Michael DeHaan
e6f495cc3b Merge pull request #8143 from PinGwynn/feature 
portage: default exit (not fail) if sync=yes in check mode
 2014-07-16 15:51:56 -04:00
Michael DeHaan
89154a3b90 Merge pull request #8156 from jirutka/fix-layman 
layman: remove my email address
 2014-07-16 11:22:13 -04:00
James Cammarata
30a7658b90 Merge pull request #7914 from hacosta/devel 
Correctly handle .repo files in zypper_repository module
 2014-07-16 09:55:35 -05:00
Jakub Jirutka
b42cd341e9 layman: remove my email address 2014-07-16 01:29:36 +02:00
Michael DeHaan
d0006f0d2a Merge pull request #8118 from oxyrox/devel 
Typo
 2014-07-15 18:15:08 -04:00
Michael DeHaan
cc4c7b1d56 Merge pull request #8111 from hfinucane/gh-8108 
Fix pip failure when version is parsed as a float
 2014-07-15 18:07:03 -04:00
Michael DeHaan
e138613db9 Merge pull request #8106 from muff1nman/pacman-update-checkmode-fix 
Fix #8047
 2014-07-15 18:04:50 -04:00
Maxim Odinintsev
36b9964c88 portage: default exit (not fail) if sync=yes in check mode 2014-07-15 16:04:19 +03:00
Aladin Jaermann
8dc0328fed Correct typo 2014-07-14 10:49:08 +02:00
Henry Finucane
ec221ae59a Ensure version is a string 2014-07-12 21:05:32 -07:00
Andrew DeMaria
65e27c3375 Fix #8047 
Ensure that json is returned when only updating the cache and in check mode
 2014-07-12 10:57:30 -05:00
Dustin C. Hatch
fbcf39e1e1 Correct regex in is_keyid 
The `rpm_key` module claims to take a key ID as an argument, however it fails if one is actually given:

    msg: Not a valid key DEADBEEF

The reason for this is the regular expression in the `RpmKey.is_keyid` method is incorrect; it will only match the literal string "0-9a-f" exactly 8 times, rather than exactly 8 characters in the set 0-9 or a-f.
 2014-07-11 14:02:25 -05:00
Jacopo
91e246a776 Fixed bug with environment path for homebrew_cask 2014-06-28 14:27:33 +10:00
Hector Acosta
35ca6d535b Check at most 16 characters of the key. Fixes #7936 
Signed-off-by: Hector Acosta <hector.acosta@gmail.com>
 2014-06-27 03:18:54 -05:00
Hector Acosta
b5fe46d48c Correctly handle .repo files in zypper_repository module 
Before the changes, removing a repository required a repo url. This shouldn't be required since zypper allows removing a repo based on its alias (mapped to name in this module).

The name variable was always required, which is misleading since repofiles provide their own alias. So a runtime check was added to avoid this confusion.

Additionaly, running this module on .repo files weren't idempotent. e.g

Before:
$ ./hacking/test-module -m library/packaging/zypper_repository -a "repo=http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo name=foo"
{"repo": "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo", "state": "present", "changed": true}
$ ./hacking/test-module -m library/packaging/zypper_repository -a "repo=http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo name=foo"
{"msg": "Repository named 'devel_languages_python' already exists. Please use another alias.\n", "failed": true}

After:
$ ./hacking/test-module -m library/packaging/zypper_repository -a "repo=http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo"
{"repo": "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo", "state": "present", "changed": true}
$ ./hacking/test-module -m library/packaging/zypper_repository -a "repo=http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo"
{"repo": "http://download.opensuse.org/repositories/devel:/languages:/python/SLE_11_SP3/devel:languages:python.repo", "state": "present", "changed": false}

Signed-off-by: Hector Acosta <hector.acosta@gmail.com>
 2014-06-26 13:17:27 -07:00
James Cammarata
8e6a60dfd6 Merge pull request #7942 from sidred10/devel 
Fixed FreeBSD ports install issue
 2014-06-26 11:50:33 -05:00
sid
2f02d27744 Fixed FreeBSD ports install issue 2014-06-26 20:52:57 +05:30
Maxim Odinintsev
f4c183f5b8 Successfull exit if sync=yes and no package provided 2014-06-26 15:02:15 +03:00
Maxim Odinintsev
f4774a71b7 Success exit if sync=yes and no package provided 2014-06-26 14:55:16 +03:00
James Cammarata
1320f862de Merge pull request #7930 from trbs/apt_key_fetch_url_failure_codes 
apt_key clear message when downloading key returns an (http) error code
 2014-06-25 22:27:08 -05:00
George Yoshida
284476d4ec In the yum module example, use present/absent instead of installed/removed 2014-06-25 23:21:43 +09:00
trbs
e12d09861f apt_key clear message when downloading key returns an (http) error code 2014-06-25 15:30:34 +02:00
Sam Hanes
ed1aef3fa5 Restore #6484 reverted by c751168. 2014-06-23 17:12:19 -07:00
James Cammarata
46100f5bc4 Merge branch 'upgrade-release' of https://github.com/amenonsen/ansible into amenonsen-upgrade-release 2014-06-23 10:35:48 -05:00
James Cammarata
590a8bf2e8 Allow deb package installation via with_items 
Fixes #7863
 2014-06-21 20:06:48 -05:00
yuyak
54fdd5416b Fix typo in apt module documentation 2014-06-21 21:27:57 +08:00
James Cammarata
9e8bbd8eac Merge pull request #7801 from koenpunt/npm-rbenv-exec 
Allow gem executable to contain spaces
 2014-06-17 11:16:42 -05:00
Koen Punt
6c20fa0d6f Allow gem executable to contain spaces 
rbenv has a special exec function which loads the correct ruby version before executing a command.
The syntax for this is `/usr/local/rbenv/bin/rbenv exec gem ...` for example.
But previously when specifying executable='/usr/local/rbenv/bin/rbenv exec gem' this would not work because the string was treated as one executable. This PR fixes that by splitting the executable on spaces.
 2014-06-17 11:58:10 +02:00
Koen Punt
ec9e6e1cd6 Allow executable to contain spaces 
NVM has a special script which loads the correct node version before executing a command.
The syntax for this is `/usr/local/nvm/nvm-exec ...`, so `nvm-exec npm list --json` for example.
But previously when specifying `executable='/usr/local/nvm/nvm-exec nvm'` this would not work because the string was treated as one executable.
 2014-06-17 01:31:24 +02:00
James Cammarata
1bec2e7eb7 Minor cleanup of openbsd_pkg example comment 2014-06-16 11:35:57 -05:00
James Cammarata
adb9feaf83 Merge pull request #7774 from mwpher/devel 
[openbsd-pkg] Add note regarding package flavors
 2014-06-16 11:33:53 -05:00
Todd Owen
198048c356 Fix in pkgutil: don't call pipes.quote() on None. 
In this function, 'site' may be None, which will cause an exception
if it is passed to pipes.quote().
 2014-06-15 10:20:35 +08:00
Matthew Pherigo
09e7cc2aa6 [openbsd-pkg] Add note regarding package flavors 
This adds a note to the openbsd-pkg module which explains how to specify
package flavors as well as how to avoid ambiguity errors on a package
with multiple flavors.

Technically, this is not Ansible-specific, but it's pretty likely the
user will encounter this problem.
 2014-06-14 19:42:09 -05:00
James Cammarata
9d86d41741 Cleaning up svr4pkg commit fix for #7645 2014-06-09 10:48:06 -05:00
James Cammarata
eb57ceee96 Merge branch '7645' of https://github.com/kcghost/ansible into kcghost-7645 2014-06-09 10:45:29 -05:00
Casey Fitzpatrick
6a5ad84656 fix for svr4pkg module failure reporting, issue #7645 2014-06-08 19:59:44 -04:00
Jean-Frédéric
ea78ad9906 Fix documentation of deb option in apt module 
The apt module may install a .deb package on the remote machine, not on the local.
Fix the misleading documentation.
 2014-06-06 18:18:44 +02:00
Andrew Resch
da7835da1d Fix typo in variable name 2014-05-23 16:09:57 -07:00
Andrew Resch
5016dc40fc Replace CommandException with Exception 2014-05-23 12:44:01 -07:00
Daniel Jaouen
3b38077246 Add upgrade_all option to homebrew module. 2014-05-23 11:09:18 -04:00
Ralf Geschke
d452bb896d added missing description of composer command 2014-05-21 18:14:21 +02:00
Ralf Geschke
af33222364 added missing description... 2014-05-21 18:12:53 +02:00
Ralf Geschke
5446bcdf90 implemented the missing "command" option, defaults to "install"... 2014-05-21 18:01:33 +02:00
James Cammarata
792298f114 Default use_proxy to True for fetch_url() 
Also added some error handling to the fetch_url() call in the
apt_repository module, so that failures to look up the PPA info
are properly handled.

Fixes #7322
 2014-05-19 23:04:13 -05:00
Abhijit Menon-Sen
9eebdd1edb Allow '-t ' to be passed to apt: upgrade 2014-05-17 23:02:20 +05:30
James Cammarata
289170bd2d Merge branch 'yum_module_typos' of https://github.com/mpeters/ansible into mpeters-yum_module_typos 2014-05-16 09:24:47 -05:00
Michael Peters
098513a8a5 slight language change based on feedback from jimi-c 2014-05-16 09:44:32 -04:00
Michael Peters
715f059c5a fixing some typos in the docs of the yum module 2014-05-16 09:22:12 -04:00
Alan Pearce
332909a956 Update composer example 
Remove unsupported 'install' argument
 2014-05-16 14:06:55 +01:00
Yuichi TANIKAWA
41fbdd9421 Add dots to valid path characters 2014-05-10 18:13:16 +09:00
James Cammarata
bf3079c77a Make sure distro variable is set if python-apt is installed 
Fixes #7295
 2014-05-06 09:42:50 -05:00
Michael DeHaan
594e5dcdd7 In apt module show 'name' vs pkg to standardize with the rest of the modules. 'pkg' is an alias for name. 2014-04-29 15:48:51 -04:00
Carlos E. Garcia
4dcaa9d9fb multiple spelling error changes 2014-04-29 10:41:05 -04:00
mkosmach
cfc8b1c561 add simplejson as alternative to json 2014-04-25 02:44:51 -07:00
Michael DeHaan
a9b4fcf703 Add missing license headers to two modules and standardize formatting of another. 2014-04-24 10:32:54 -04:00
James Cammarata
33c1f697d2 Merge branch 'apt_key_format' of https://github.com/andreasf/ansible into andreasf-apt_key_format 2014-04-24 00:02:10 -05:00
James Cammarata
6468b72d59 Merge pull request #7022 from jjshoe/patch-1 
apt_key lists all keys in uppercase
 2014-04-23 15:58:23 -05:00
James Cammarata
2725538515 Merge pull request #7095 from radeksimko/pokemon-exc-fix 
Prevent catching unrelated exceptions
 2014-04-21 11:49:04 -05:00
Radek Simko
08befa9c86 Prevention for catching unrelated exceptions added 2014-04-21 15:35:49 +01:00
Radek Simko
7d47f46807 Explicit check of return code for autoinstallation of python-apt added 
This will allow easier debugging through more meaningful error message.
 2014-04-21 14:10:09 +01:00
Andreas Fleig
cef705d04f apt_key: fix key lookup for 64 bit key ids 
Fixes #7018 by extending `all_keys` to work with either short or long keys.

Also removes the ununsed method `key_present`.
 2014-04-17 03:51:19 +02:00
jjshoe
eeb2c240ca apt_key lists all keys in uppercase 
allow for a little user error
 2014-04-16 10:06:59 -05:00
Cédric RICARD
556c780ac9 Fixed test on 'cached' parameter. 
'cached' parameter is boolean, not string
 2014-04-15 16:41:27 +02:00
James Tanner
076bba555f Addresses #6908 Add a mode parameter to apt_repository 2014-04-14 16:42:23 -04:00
James Tanner
c827f8ad3d Remove debug line 2014-04-14 16:02:08 -04:00
James Tanner
f273d3ef42 Addresses #6908 Strip usernames and passwords from apt_repository filenames 2014-04-14 13:18:21 -04:00
James Tanner
e4d7ffc47c Fix version added for annotation in pkgng 2014-04-08 10:28:01 -04:00
James Tanner
2ac7caa3c6 Fix version_added for install_options in homebrew 2014-04-08 10:13:33 -04:00
Drew Blas
2755a8296e Update apt:deb with correct version 
The docs site says this option is available in 1.5, but it is not.  

#5910 https://github.com/ansible/ansible/pull/5910 added the deb option.  The PR was generated two months ago (before 1.5) but was not included until after 1.5 was released.  This fixes the docs.
 2014-04-04 05:59:57 -05:00
Michael DeHaan
e5ad1febc0 Merge pull request #6793 from muffl0n/patch-4 
apt_key: Output URL for debugging
 2014-04-03 17:35:49 -04:00
Michael DeHaan
2e62cbdaa2 Clarify docs message. 2014-04-02 17:37:10 -04:00
Michael DeHaan
89c1e50f7b Note that keyserver was added in 1.6 2014-04-02 17:18:14 -04:00
Andrew Resch
dfdca084f0 redhat_subscription calls AnsibleModule() without argument_spec 
The Rhsm object requires an AnsibleModule but it isn't created with an argument_spec and fails.  Since the rhn.module is set directly after, setting None for the required argument of Rhsm fixes the module.
 2014-04-01 11:22:29 -07:00
Sven Schliesing
ff0d0afb07 Output URL for debugging 2014-04-01 13:55:58 +02:00
James Tanner
f7609c8bbe Fix merge conflicts 2014-03-31 13:15:21 -04:00
Daniel Jaouen
44b563a40a Miscellaneous fixes to homebrew module. 2014-03-28 19:37:05 -04:00
Daniel Jaouen
e77c65af80 Update homebrew module. 2014-03-28 19:20:51 -04:00
Michael DeHaan
b566b27edd Merge pull request #6746 from Jmainguy/svr4pkg 
svr4pkg changes - Did my best to rebase. Now includes the latest changes made to devel, al...
 2014-03-28 18:50:29 -04:00
Michael DeHaan
a72d15fb7f Changelog and version updates. 2014-03-28 17:01:15 -04:00
Michael DeHaan
1657792a05 Merge branch 'layman' of git://github.com/jirutka/ansible into devel 2014-03-28 17:00:52 -04:00
Jonathan Mainguy
a5ac920a19 Did my best to rebase. Now includes the latest changes made to devel, along with my change of adding category option to module 2014-03-28 15:35:52 -04:00
Michael DeHaan
6fb2d56970 Resolve merge. 2014-03-28 14:56:59 -04:00
Michael DeHaan
7ced8de690 Rename apt-rpm to apt_rpm. 2014-03-28 13:18:49 -04:00
Michael DeHaan
5599835a1d Merge branch 'apt-rpm' of git://github.com/evgkrsk/ansible into devel 2014-03-28 13:17:37 -04:00