Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…

…elop

Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
latest commit 307d3d05a4
@basepi basepi authored
..
Failed to load latest commit information.
inspectlib Lintfix
__init__.py Add encoding to modules package
aliases.py Update aliases.py
alternatives.py Making salt.modules.alternatives python3 compatible
apache.py Fix list render in apache
aptpkg.py Fetch a keyid ID from a fingerprint
archive.py More Beryllium --> 2015.8.0 version reference changes
artifactory.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
at.py simplify at.at command setup
augeas_cfg.py Fix more pylint errors.
aws_sqs.py Merge branch '2014.7' into merge-forward-2015.2
bamboohr.py More Beryllium --> 2015.8.0 version reference changes
beacons.py More Beryllium --> 2015.8.0 version reference changes
bigip.py Making salt.modules.boto_rds Python3 compatible
blockdev.py update release codenames
bluez.py Use `shlex_quote` from six
boto_asg.py Fixing more sphinx errors and warnings
boto_cfn.py More Beryllium --> 2015.8.0 version reference changes
boto_cloudwatch.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
boto_dynamodb.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
boto_ec2.py Add versionadded strings
boto_elasticache.py Fixing more sphinx errors and warnings
boto_elb.py Fixing more sphinx errors and warnings
boto_iam.py Add execution module to export current IAM users
boto_kms.py Started changing Beryllium references to 2015.8.0
boto_rds.py More Beryllium --> 2015.8.0 version reference changes
boto_route53.py as requested, fix the style errors at https://jenkins.saltstack.com/j…
boto_secgroup.py remove now-unused imports; thanks Jenkins.
boto_sns.py Fixing more sphinx errors and warnings
boto_sqs.py Fixing more sphinx errors and warnings
boto_vpc.py Add versionadded directives for #26312
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 Started changing Beryllium references to 2015.8.0
cassandra.py column_family_definition requires keyspace, column_family args
cassandra_cql.py A single `isinstance()` check for all types is enough
chef.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
chocolatey.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
cloud.py Py3 compatibility fixes.
cmdmod.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
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 More Beryllium --> 2015.8.0 version reference changes
cp.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
cpan.py Update Lithium docstrings in 2015.2 branch
cron.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 Put data.getval and data.getvals on deprecation path with a warning
ddns.py match pylint rule
deb_apache.py Making salt.modules.deb_apache python3 compatible
deb_postgres.py lint
debbuild.py Removed use of pbuilder option --clean for Debian builds
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 services on devuan
defaults.py create and parse salt:// URLs with url util
devmap.py Making salt.modules.devmap python3 compatible
dig.py Update dig.py
disk.py update release codenames
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 Used of salt.utils.version_cmp for string comparison and correct lint…
dockerng.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
dpkg.py More Beryllium --> 2015.8.0 version reference changes
drac.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
drbd.py Making salt.modules.drbd python3 compatible
ebuild.py More Beryllium --> 2015.8.0 version reference changes
eix.py Making salt.modules.eix python3 compatible
elasticsearch.py declare YAML as code block
environ.py Fixed lint issues
eselect.py Remove deprecations in eselect module
etcd_mod.py Updated etcd_mod module to use __utils__
event.py Merge pull request #25989 from rallytime/bp-25832
extfs.py Merge branch '2014.7' into merge-forward-2015.2
file.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
firewalld.py More Beryllium --> 2015.8.0 version reference changes
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 remove redundant backslashes
freebsdports.py Move `salt.utils.six` to `salt.ext.six`
freebsdservice.py bugfix: fix service.enable for missing rc.conf
gem.py Merge remote-tracking branch 'upstream/2015.8' into develop
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 Properly handle git config --get on local repo config in older git
github.py fix version added string
glance.py Only strip "/v2", not any char in "v2" from endpt
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.8' 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 Changed output of haproxy commands to be more close to old behavior -…
hashutil.py Fix versionadded to Boron
hg.py Update Lithium docstrings in 2015.2 branch
hipchat.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
hosts.py Lint #26688
htpasswd.py Make enhancements to htpasswd modules
http.py Fixes for doc build errors
ifttt.py Started changing Beryllium references to 2015.8.0
ilo.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 ini_unit test fix
introspect.py Py3 compatibility fixes.
ipmi.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
ipset.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
iptables.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
jboss7.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
jboss7_cli.py Py3 compatibility fixes.
jenkins.py Initially adding module and state module to manage Jenkins from Salt.
junos.py Fix lint.
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-2015.8
kmod.py Pylint fix
launchctl.py Manual merge of #24414 per thatch45
layman.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
linux_sysctl.py py3: fix salt/modules/linux_sysctl.py
localemod.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 Fixes #26024
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 Remove Beryllium Deprecation Warnings
mdadm.py Don't split the string on a single line
memcached.py Move `salt.utils.six` to `salt.ext.six`
mine.py Subscribe event to bus is optional now
mod_random.py More Beryllium --> 2015.8.0 version reference changes
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-2015.8
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 More Beryllium --> 2015.8.0 version reference changes
netaddress.py Python3 compat fix
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-2015.8
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 Lintfix
nova.py Making salt.modules.nova python3 compatible
npm.py Fix many errors with __virtual__ in tests
nspawn.py More Beryllium --> 2015.8.0 version reference changes
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 Update openbsdpkg.py
openbsdrcctl.py Please lint.
openbsdservice.py Py3 compatibility fixes.
openstack_config.py Merge branch '2014.7' into merge-forward-2015.2
opkg.py opkg: add opkg execution module
oracle.py fix various typos
osquery.py More Beryllium --> 2015.8.0 version reference changes
osxdesktop.py Merge branch '2014.7' into merge-forward-2015.2
pacman.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
pecl.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
pillar.py More Beryllium --> 2015.8.0 version reference changes
pip.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
pkg_resource.py Fix error message when local bin pkg path is not absolute
pkgin.py try to pass pylint, catch only the correct exception
pkgng.py remove redundant backslashes
pkgutil.py Merge branch '2014.7' into develop
portage_config.py Prevent no filename being given for the atom '*/*'
postfix.py Making salt.modules.postfix python3 compatible
postgres.py More Beryllium --> 2015.8.0 version reference changes
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 Don't stacktrace trying to publish without a master
puppet.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
pushover_notify.py moving common code from pushover module and return to salt.utils.push…
pw_group.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
pw_user.py add .. versionadded:: Boron
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 More Beryllium --> 2015.8.0 version reference changes
random_org.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
rbenv.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
rdp.py Merge branch '2014.7' into 2015.2
redismod.py fix linting errors
reg.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
rest_package.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
rest_sample.py Making salt.modules.rest_sample python3 compatible
rest_service.py [minionproxy] example modules fixes
ret.py Making salt.modules.ret python3 compatible
rh_ip.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
rh_service.py convert osrelease grain to str before str op
riak.py More Beryllium --> 2015.8.0 version reference changes
rpm.py More Beryllium --> 2015.8.0 version reference changes
rpmbuild.py Updates for review comments
rsync.py Merge branch '2014.7' into merge-forward-2015.2
runit.py add runit service module
rvm.py Fixed to expanded URL
s3.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
saltcloudmod.py Merge branch '2014.7' into merge-forward-2015.2
saltutil.py Merge pull request #26648 from whiteinge/fix-shadowed-fun-arg
schedule.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
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 Fix services on devuan
shadow.py Merge pull request #21371 from pengyao/shadow_typo
slack_notify.py Moving common query function from slack module & returner to salt.uti…
smartos_imgadm.py salt.modules.smartos_imgadm - fix incorrect parsing of message on delete
smartos_virt.py imported smartos_virt.py from develop
smartos_vmadm.py lint fixes and warnings
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 Module executors initial implementation
splunk.py fix version added string
splunk_search.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
sqlite3.py Update sqlite3.py to enable autocommit
ssh.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
state.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
status.py Adding a time function to the status module to return the current dat…
stormpath.py More Beryllium --> 2015.8.0 version reference changes
sudo.py Module executors initial implementation
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 Lint #25933
sysrc.py fix bug in sysrc to allow for empty rc variables
system.py document system.shutdown arg
system_profiler.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
system_rest_sample.py Fix lint.
systemd.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
telemetry.py Fix warns
temp.py More Beryllium --> 2015.8.0 version reference changes
test.py Adapt proxy minion to tornado and break out proxy startup to separate…
test_virtual.py Fix mis-naming from pylint cleanup
timezone.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
tls.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
tomcat.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
trafficserver.py Started changing Beryllium references to 2015.8.0
tuned.py Py3 compatibility
twilio_notify.py Merge forward 2015.2->develop
udev.py More Beryllium --> 2015.8.0 version reference changes
upstart.py Adds support for nested upstart scripts in the form of subfolder/serv…
uptime.py fix empty lines (lint), fix documentation
useradd.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
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 Merge pull request #25254 from rallytime/change_beryllium_refs
virt.py Add deprecation warning for libvirt.
virtualenv_mod.py use != instead of > to compare success status of retcode
win_autoruns.py fix autoruns.list looking in wrong directory
win_dacl.py Pylint fix for real this time
win_disk.py py3: fix salt/modules/win_disk.py
win_dns_client.py Update win_dns_client.py
win_file.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
win_firewall.py fix win_firewall.delete_rule
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 Fixed Pylint and version added
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 add doc to win_pkg.compare_versions
win_powercfg.py Started changing Beryllium references to 2015.8.0
win_repo.py Add some missing imports for masterless winrepo
win_servermanager.py Fixed problem with win_servermanager.list_installed
win_service.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
win_shadow.py Merge branch '2014.7' into merge-forward
win_status.py More Beryllium --> 2015.8.0 version reference changes
win_system.py Fix missing seconds variable
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 Fix lint
win_wua.py Fixed some documentation errors
x509.py Started changing Beryllium references to 2015.8.0
xapi.py Add deprecation warning for Xen API
xfs.py Py3 compatibility fixes.
xmpp.py Fixing more sphinx/docs errors and warnings
yumpkg.py Merge pull request #26572 from ngrennan-inflection/dnf-support
zcbuildout.py Fix False comparison
zenoss.py Resolve lint issues
zfs.py Fix many errors with __virtual__ in tests
zk_concurrency.py Add party controls to zk_concurrency
znc.py Merge branch '2014.7' into merge-forward-2015.2
zpool.py Merge remote-tracking branch 'upstream/2015.8' into merge-forward-dev…
zypper.py Bugfix: crash at getting non-existing repo
Something went wrong with that request. Please try again.