Merge branch '2019.2.1' into crypt_test_mac

This commit is contained in:
Megan Wilhite 2019-06-17 18:30:46 -04:00 committed by GitHub
commit 832ded687d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 0 deletions

View file

@ -23,6 +23,7 @@ execution modules
acme
aix_group
aixpkg
aliases
alternatives
ansiblegate

View file

@ -0,0 +1,7 @@
===================
salt.modules.aixpkg
===================
.. automodule:: salt.modules.aixpkg
:members:
:undoc-members:

View file

@ -12,6 +12,7 @@ salt.modules.pkg
====================================== ========================================
Execution Module Used for
====================================== ========================================
:py:mod:`~salt.modules.aixpkg` AIX OS using ``installp`` and ``rpm``
:py:mod:`~salt.modules.aptpkg` Debian/Ubuntu-based distros which use
``apt-get(8)`` for package management
:py:mod:`~salt.modules.brew` Mac OS software management using