Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Merge pull request #25135 from basepi/merge-forward-develop

Merge forward from 2015.8 to develop
latest commit 8f91da6d6c
@basepi basepi authored
..
Failed to load latest commit information.
inspectlib Manual merge of #24414 per thatch45
__init__.py Add encoding to modules package
aliases.py Update aliases.py
alternatives.py Making salt.modules.alternatives python3 compatible
apache.py Py3 compatibility fixes.
aptpkg.py Use python_shell=False to install .deb pkgs
archive.py fix for 2015.5.0 modules/archive.py ZipFile instance has no attribute…
artifactory.py Lint PR
at.py simplify at.at command setup
augeas_cfg.py Update augeas_cfg.py
aws_sqs.py Merge branch '2014.7' into merge-forward-2015.2
bamboohr.py Adding versionadded
beacons.py lint
bigip.py Making salt.modules.boto_rds Python3 compatible
blockdev.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
bluez.py Use `shlex_quote` from six
boto_asg.py Fixing more sphinx errors and warnings
boto_cfn.py boto_cfn: allow for optional keys in describe
boto_cloudwatch.py Fixing more sphinx errors and warnings
boto_dynamodb.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
boto_ec2.py Fixing more sphinx/docs errors and warnings
boto_elasticache.py Fixing more sphinx errors and warnings
boto_elb.py Fixing more sphinx errors and warnings
boto_iam.py Fixing more sphinx/docs errors and warnings
boto_kms.py Add new module type for serializers from issue #22257.
boto_rds.py Fixing more sphinx errors and warnings
boto_route53.py Support all route53 record types
boto_secgroup.py Fixing more sphinx errors and warnings
boto_sns.py Fixing more sphinx errors and warnings
boto_sqs.py Fixing more sphinx errors and warnings
boto_vpc.py Fixing more sphinx errors and warnings
bower.py Implement Bower execution module
brew.py Fix typos
bridge.py Merge branch '2014.7' into merge-forward-2015.2
bsd_shadow.py Add `absolute_import` where needed.
btrfs.py Move `salt.modules.fsutils` to `salt.utils.fsutils`. It's not a salt …
cabal.py Add versionadded directives to new state/module
cassandra.py column_family_definition requires keyspace, column_family args
cassandra_cql.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
chef.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
chocolatey.py Resolve merge conflicts
cloud.py Py3 compatibility fixes.
cmdmod.py Lint
composer.py Fix for issue #21491
config.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
consul.py Changes to various modules to allow configuration items to be pulled …
container_resource.py fix dockerng reference -ng -> ng
cp.py Added pillarenv support to cp module
cpan.py Update Lithium docstrings in 2015.2 branch
cron.py Manual merge of #24414 per thatch45
cyg.py Fix lint errors
cytest.pyx Audit module documentation (A to D)
daemontools.py Merge branch '2014.7' into merge-forward-2015.2
darwin_pkgutil.py Avoid shadowing list type in modules.darwin_pkgutil; fixes #20120
darwin_sysctl.py Merge branch '2014.7' into merge-forward-2015.2
data.py Merge fix
ddns.py Added option keyalgorithm for DDNS updates (defaults to:
deb_apache.py Making salt.modules.deb_apache python3 compatible
deb_postgres.py lint
debconfmod.py Merge branch '2014.7' into merge-forward-2015.2
debian_ip.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
debian_service.py fix some tests
defaults.py create and parse salt:// URLs with url util
devmap.py Making salt.modules.devmap python3 compatible
dig.py Merge branch '2014.7' into merge-forward-2015.2
disk.py Merge branch '2015.2' into 2015.2-develop
djangomod.py Py3 compatibility fixes.
dnsmasq.py Making salt.modules.modules-python3-dnsmasq.py python3 compatible
dnsutil.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
dockerio.py fix bug in docker.loaded
dockerng.py Fix anchors
dpkg.py Add lowpkg.bin_pkg_info for dpkg
drac.py fix deprecation warnings shown during unit tests
drbd.py Making salt.modules.drbd python3 compatible
ebuild.py fix PEP8 mistakes
eix.py Making salt.modules.eix python3 compatible
elasticsearch.py CLI examples and docstrings
environ.py Py3 compatibility fixes.
eselect.py Remove deprecations in eselect module
etcd_mod.py Making salt.modules.etcd_mod python3 compatible
event.py More Sreq cleanup
extfs.py Merge branch '2014.7' into merge-forward-2015.2
file.py Merge pull request #25116 from nmadhok/file-replace-count-patch
firewalld.py Fixing sphinx/docs errors and warnings
freebsd_sysctl.py Merge branch '2014.7' into merge-forward-2015.2
freebsdjail.py Manual merge of #24414 per thatch45
freebsdkmod.py Fix lint failure
freebsdpkg.py Merge branch '2014.7' into merge-forward
freebsdports.py Move `salt.utils.six` to `salt.ext.six`
freebsdservice.py Merge branch '2014.7' into 2015.2
gem.py Add method list_upgrades (modeled on the salt.modules.pip). Calls 'ge…
genesis.py Merge branch '2014.7' into merge_forward_8798
gentoo_service.py Add `absolute_import` where needed.
gentoolkitmod.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
git.py Versionadded tags for https_user and https_pass args new in 2015.5.0
glance.py Fixed glance image_create
glusterfs.py Allow volumes to be forced even if on root FS
gnomedesktop.py Add `absolute_import` where needed.
gpg.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
grains.py Grains file lock
groupadd.py Add `absolute_import` where needed.
grub_legacy.py Making salt.modules.grub_legacy python3 compatible
guestfs.py Merge branch '2014.7' into merge-forward-2015.2
hadoop.py Merge branch '2014.7' into merge-forward-2015.2
haproxyconn.py expose objectify parameter
hashutil.py Manual merge of #24414 per thatch45
hg.py Update Lithium docstrings in 2015.2 branch
hipchat.py convert hipchat module and returner to use salt.utils.http.
hosts.py Chang variable to empty string if it's None
htpasswd.py Make enhancements to htpasswd modules
http.py Fixes for doc build errors
ifttt.py Merge pull request #24801 from garethgreenaway/ifttt_module
ilo.py Fix misspellings
img.py Py3 compatibility fixes.
incron.py fix incron module typos
influx.py Merge pull request #20497 from highlyunavailable/feature/influxdb_fixes
ini_manage.py Merge branch '2014.7' into merge-forward
introspect.py Py3 compatibility fixes.
ipmi.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
ipset.py Merge branch '2014.7' into merge-forward-2015.2
iptables.py Add all iptables jump args from manpage
jboss7.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
jboss7_cli.py Py3 compatibility fixes.
junos.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
kerberos.py Add missing blank line after code-block directive
key.py Making salt.modules.key python3 compatible
keyboard.py Merge branch '2014.7' into merge-forward
keystone.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
kmod.py Pylint fix
launchctl.py Manual merge of #24414 per thatch45
layman.py PEP fix
ldapmod.py Making salt.modules.ldapmod python3 compatible
linux_acl.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
linux_lvm.py Lintfix: Unnecessary parents after raise keyword
linux_sysctl.py py3: fix salt/modules/linux_sysctl.py
localemod.py join_locale is now in salt.utils.locales
locate.py Merge branch '2014.7' into merge-forward-2015.2
logadm.py Merge branch '2014.7' into merge-forward-2015.2
logrotate.py Making salt.modules.logrotate python3 compatible
lvs.py Merge branch '2014.7' into merge-forward-2015.2
lxc.py unset size parameter for lxc.create when backing=zfs
mac_group.py Add `absolute_import` where needed.
mac_user.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
macports.py Py3 compatibility fixes.
makeconf.py Pylint fix
match.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
mdadm.py Don't split the string on a single line
memcached.py Move `salt.utils.six` to `salt.ext.six`
mine.py Salt mine: sending stack trace to the debug log on 'Function in mine_…
mod_random.py Fix documentation on mod_random.seed module
modjk.py Use `urllib2.*` from six
mongodb.py fix connection function to mongo
monit.py Merge branch '2014.7' into merge-forward-2015.2
moosefs.py Merge branch '2014.7' into merge-forward-2015.2
mount.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
mssql.py PyLint adjustments in modules/mssql.py
munin.py fix backtrace, when listing plugins
mysql.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
nacl.py Bug fixes and build errors
nagios.py Py3 compatibility fixes.
nagios_rpc.py Changes to various modules to allow configuration items to be pulled …
netbsd_sysctl.py Bah, False!
netbsdservice.py Merge branch '2014.7' into merge-forward
netscaler.py convert netscalar BaseException.message
network.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
neutron.py update module.neutron to work with all options that create-network ha…
nfs3.py Making salt.modules.nfs3 python3 compatible
nftables.py Merge remote-tracking branch 'salt/2014.7' into 2015.2
nginx.py Only split values outside of single quotes
node.py fix develop py-2.6 lint
nova.py Making salt.modules.nova python3 compatible
npm.py Try byte literals rather than unicode strings in the env
nspawn.py Lint fixes
omapi.py Making salt.modules.omapi python3 compatible
openbsd_sysctl.py Fix for cross-platform sysctl with test and custom config location wh…
openbsdpkg.py Merge branch '2014.7' into merge-forward-2015.2
openbsdrcctl.py openbsdrcctl: turn badvar into a tuple and fix lint warnings
openbsdservice.py Py3 compatibility fixes.
openstack_config.py Merge branch '2014.7' into merge-forward-2015.2
oracle.py fix various typos
osquery.py Adding missing versionadded tags
osxdesktop.py Merge branch '2014.7' into merge-forward-2015.2
pacman.py Python 3 compat
pagerduty.py Allow pagerduty module to work with config in pillar
pagerduty_util.py Fix a couple docstrings
pam.py Making salt.modules.pam python3 compatible
parted.py fix parsing the output of parted
pecl.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
pillar.py Add module function "pillar.keys"
pip.py Added --trusted-host option to pip.installed.
pkg_resource.py Fix binary package caching
pkgin.py Fix compatibility with pkgin > 0.7
pkgng.py Linter happiness
pkgutil.py Merge branch '2014.7' into develop
portage_config.py add versionadded
postfix.py Making salt.modules.postfix python3 compatible
postgres.py py3: fix salt/modules/postgres.py and tests
poudriere.py Merge branch '2014.7' into merge-forward
powerpath.py Merge branch '2014.7' into merge-forward-2015.2
ps.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
publish.py Add option -J/--pillar-pcre to match on pillar PCREs
puppet.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
pushover_notify.py Changes to various modules to allow configuration items to be pulled …
pw_group.py Merge branch '2014.7' into merge-forward-2015.2
pw_user.py Add `absolute_import` where needed.
pyenv.py Merge branch '2014.7' into merge-forward
qemu_img.py Merge branch '2014.7' into 2015.2
qemu_nbd.py Py3 compatibility fixes.
quota.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
rabbitmq.py need to run with a vhost to apply policies to other vhosts
raet_publish.py Add option -J/--pillar-pcre to match on pillar PCREs
rallydev.py Adding versionadded
random_org.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
rbenv.py Py3 compatability
rdp.py Merge branch '2014.7' into 2015.2
redismod.py Add `absolute_import` where needed.
reg.py Py3 compatibility fixes.
rest_package.py Making salt.modules.rest_package python3 compatible
rest_sample.py Making salt.modules.rest_sample python3 compatible
rest_service.py Making salt.modules.rest_service python3 compatible
ret.py Making salt.modules.ret python3 compatible
rh_ip.py Fix pylint failure on develop
rh_service.py convert osrelease grain to str before str op
riak.py Additional riak functions
rpm.py Add missing quote
rpmbuild.py on all network file calls
rsync.py Merge branch '2014.7' into merge-forward-2015.2
runit.py add runit service module
rvm.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
s3.py s3.head: return useful data
saltcloudmod.py Merge branch '2014.7' into merge-forward-2015.2
saltutil.py changed 'reload_modules' argument to 'refresh' in sync_all function
schedule.py only persist non-pillar schedule items
scsi.py Making salt.modules.scsi python3 compatible
sdb.py fix various typos
seed.py fix deprecation warnings shown during unit tests
selinux.py Py3 compatibility fixes.
sensors.py Merge branch '2014.7' into merge-forward-2015.2
serverdensity_device.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
service.py Allow mint to use upstart
shadow.py Merge pull request #21371 from pengyao/shadow_typo
slack_notify.py lint
smartos_imgadm.py Merge branch '2014.7' into merge-forward-2015.2
smartos_vmadm.py Merge branch '2014.7' into merge-forward
smbios.py Minor fix on clean
smf.py Add `absolute_import` where needed.
smtp.py Fixing more sphinx/docs errors and warnings
softwareupdate.py Merge branch '2014.7' into merge-forward-2015.2
solaris_group.py Merge branch '2014.7' into merge-forward-2015.2
solaris_shadow.py Merge branch '2014.7' into merge-forward-2015.2
solaris_user.py Add `absolute_import` where needed.
solarisips.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
solarispkg.py Update solarispkg.py
solr.py Py3 compatibility fixes.
splay.py Making salt.modules.splay Python3 compatible
splunk_search.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
sqlite3.py Update sqlite3.py to enable autocommit
ssh.py fix ssh AuthorizedKeysFile path processing
state.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
status.py Python 3 compat for salt/modules/status.py
stormpath.py Updates to Stormpath as per Randall Degges
sudo.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
supervisord.py Merge branch '2014.7' into 2015.2
svn.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
swift.py Making salt.modules.swift python3 compatible
sysbench.py Move `salt.utils.six` to `salt.ext.six`
syslog_ng.py Py3 compatibility fixes. Lint.
sysmod.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
sysrc.py which_bin requires an Iterable collection
system.py document system.shutdown arg
system_profiler.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
systemd.py Merge pull request #23060 from makinacorpus/service
temp.py nail in pylint newline coffin for temp
test.py lint
test_virtual.py Fix mis-naming from pylint cleanup
timezone.py Merge branch '2014.7' into merge-forward
tls.py Don't pollute the TZ environment variable
tomcat.py Merge branch '2015.2' into merge-forward-develop
trafficserver.py Manual merge of #24414 per thatch45
tuned.py Py3 compatibility
twilio_notify.py Merge forward 2015.2->develop
udev.py CopyPasteFix is a difficult workflow
upstart.py Add missing import
uptime.py fix empty lines (lint), fix documentation
useradd.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
uwsgi.py Merge branch '2014.7' into merge-forward-2015.2
varnish.py Merge branch '2014.7' into merge-forward-2015.2
vbox_guest.py vbox_guest module: not upgrade OS by default (can be unexpected)
victorops.py Changes to various modules to allow configuration items to be pulled …
virt.py Manual merge of #24414 per thatch45
virtualenv_mod.py use != instead of > to compare success status of retcode
win_autoruns.py Merge branch '2014.7' into merge-forward
win_dacl.py Pylint fix for real this time
win_disk.py py3: fix salt/modules/win_disk.py
win_dns_client.py Merge branch '2014.7' into merge-forward-2015.2
win_file.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
win_firewall.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
win_groupadd.py Revert "Modified win_groupadd to use ADSI like win_useradd, added abi…
win_ip.py Merge branch '2014.7' into merge-forward
win_network.py Call the windows specific function not the general one
win_ntp.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
win_path.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
win_pkg.py split the log out
win_powercfg.py Fixed powercfg on windows 7
win_repo.py Update win_repo.py
win_servermanager.py Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
win_service.py py3: fix salt/modules/win_service.py
win_shadow.py Merge branch '2014.7' into merge-forward
win_status.py py3: fix salt/modules/win_status.py and tests
win_system.py prefer shutdown timeout value in minutes on windows
win_timezone.py Edited wind_timezone.py to check for tzutil in windows
win_update.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
win_useradd.py Fixed where I broke user.absent
win_wua.py Fixed some lint
x509.py Fix lint (except ImportError)
xapi.py Some minimum-python-version PyLint disables
xfs.py Py3 compatibility fixes.
xmpp.py Fixing more sphinx/docs errors and warnings
yumpkg.py Update docstrings
zcbuildout.py Fix False comparison
zfs.py zfs: Fix spurious retcode hijacking in virtual
zk_concurrency.py Add party controls to zk_concurrency
znc.py Merge branch '2014.7' into merge-forward-2015.2
zpool.py Update Lithium docstrings in 2015.2 branch
zypper.py Added baseurl as alias for url and mirrorlist in salt.modules.zypper.…
Something went wrong with that request. Please try again.