Colton Myers
071751d13f
Merge pull request #24214 from basepi/2015.5.1release
...
2015.5.1release
2015-05-28 10:23:57 -06:00
Colton Myers
e5ba31b5b5
2015.5.1 release date
2015-05-28 10:19:47 -06:00
Colton Myers
768494c819
Update latest release in docs
2015-05-28 10:19:00 -06:00
Ronald van Zantvoort
a68d515973
ShouldFix _- troubles in debian_ip
...
ShouldFixes regression introduced in #23917 .
See also #23922
Since *ANY* half-decent bridge config on Debians will bork with this bug in, recommend to give this a highish prio
2015-05-28 17:13:57 +02:00
Erik Johnson
ca807fb032
Clarify error in rendering template for top file
...
The current error is slightly ambiguous, this makes it 100% clear that
the problem occured while rendering the top file.
2015-05-28 09:51:07 -05:00
Hazel
23284b5d47
Docstring fix in salt.modules.yumpkg.hold
...
Docstring fix: s/deleted/held/ in salt.modules.yumpkg.hold
2015-05-28 08:37:56 -06:00
Nicole Thomas
ea413bcb83
Merge pull request #24205 from hazelesque/20150528-yumpkg-hold-docstring-fix
...
Docstring fix in salt.modules.yumpkg.hold
2015-05-28 08:37:07 -06:00
Jayesh Kariya
657b709932
adding states/ports unit test case.
2015-05-28 17:11:41 +05:30
Hazel
72a5399932
Docstring fix in salt.modules.yumpkg.hold
...
Docstring fix: s/deleted/held/ in salt.modules.yumpkg.hold
2015-05-28 10:58:33 +01:00
Justin Findlay
c2f1fdb244
Merge pull request #24202 from rallytime/bp-24186
...
Backport #24186 to 2015.5
2015-05-27 23:16:48 -06:00
Justin Findlay
8a085a2592
Merge pull request #24192 from rallytime/bp-20474
...
Backport #20474 to 2015.5
2015-05-27 23:16:18 -06:00
Justin Findlay
7cc535bf4a
Merge pull request #24184 from rallytime/bp-24129
...
Backport #24129 to 2015.5
2015-05-27 23:15:08 -06:00
Justin Findlay
eb0af70e5b
Merge pull request #24183 from rallytime/bp-19320
...
Backport #19320 to 2015.5
2015-05-27 23:14:36 -06:00
Tyler Cipriani
db793dd0de
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 21:56:29 -06:00
Nicole Thomas
1b5bf23187
Merge pull request #24201 from whiteinge/rest_cherrypy-client-libs
...
Add list of client libraries for the rest_cherrypy module to the top-level documentation
2015-05-27 20:12:08 -06:00
Seth House
5f718027ca
Add list of client libraries for the rest_cherrypy module
2015-05-27 19:10:48 -06:00
Seth House
28fc77f6f6
Fix rest_cherrypy config example indentation
...
This indentation was erroneously changed in #24185 .
2015-05-27 19:10:33 -06:00
Ryan Lane
7b9ae82951
Lint fix
2015-05-27 17:57:46 -07:00
Ryan Lane
b74b0d1413
Various fixes for boto_route53 and boto_elb
...
* Fix for route53 entries with * in their names
* Have boto_elb use boto_route53's state module directly
* Fix for boto_elb alarms
2015-05-27 16:54:15 -07:00
Jerzy Drozdz
03c32e40b7
.gitignore update
2015-05-28 00:40:31 +02:00
Nicole Thomas
3307ec20d9
Merge pull request #24195 from rallytime/merge-24185
...
Merge #24185 with a couple of fixes
2015-05-27 16:18:37 -06:00
Nicole Thomas
561d7b72bb
Merge pull request #24187 from DSRCompany/postinitio_rename
...
Changed the now deprecated .postinitio to ._prepare
2015-05-27 16:12:46 -06:00
Nicole Thomas
fd41993022
Merge pull request #24157 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-27 16:09:00 -06:00
Jerzy Drozdz
1d30f32540
Added new RH route template for RHEL6 and newer
2015-05-28 00:02:53 +02:00
rallytime
d8daa9dcd7
Merge #24185 with a couple of fixes
...
Refs #24185
2015-05-27 15:25:27 -06:00
Colton Myers
116b88dac3
Fix mocking in file state unit tests
2015-05-27 14:55:34 -06:00
Manoli Yiannakakis
fd3c783f3e
add sudo, sudo_password params to deploy to allow for non-root deploys
2015-05-27 14:31:36 -06:00
Nicole Thomas
7e400bc3d7
Merge pull request #24166 from jayeshka/pkgng-states-unit-test
...
adding states/pkgng unit test case.
2015-05-27 14:27:49 -06:00
Nicole Thomas
9fcda79cd4
Merge pull request #24189 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-05-27 14:26:31 -06:00
Aneesh Agrawal
37442eaddd
Fix lint issues.
2015-05-27 16:01:52 -04:00
Jacob Hammons
634d56bca0
Fixed pylon error
2015-05-27 13:45:00 -06:00
Robert Fairburn
db996100bf
Support split_dns on route53
2015-05-27 14:42:27 -05:00
Michael Steed
086a1a94e8
lint
2015-05-27 13:36:25 -06:00
Michael Steed
65de62f852
fix #23815
...
- fix stack trace when recurse=True and auto_add=True
- simplify the code a bit
- clean up documentation
2015-05-27 13:32:43 -06:00
Michael Steed
d04e9162de
spelling
2015-05-27 13:32:16 -06:00
Nicole Thomas
42d4244e3c
Merge pull request #24186 from thcipriani/develop
...
Update salt vagrant provisioner info
2015-05-27 13:31:30 -06:00
Michael Steed
db9f6820b8
add inotify beacon unit tests
2015-05-27 13:26:36 -06:00
Colton Myers
8839e9c22e
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/modules/tls.py
2015-05-27 13:13:04 -06:00
Colton Myers
90e557ca90
join_locale is now in salt.utils.locales
2015-05-27 13:08:42 -06:00
Colton Myers
9dab9a1dda
Fix python3 lint
2015-05-27 13:07:47 -06:00
Aneesh Agrawal
ac4792f68d
Add a SQLite3 ext_pillar built on the sql_base pillar.
2015-05-27 14:45:33 -04:00
Aneesh Agrawal
decb6cef97
Extract PEP 249 compliant sql_base ext_pillar from MySQL.
...
Refactor the mysql ext_pillar so all PEP 249 generic code is in
sql_base to allow for easy addition of new ext_pillars.
2015-05-27 14:45:33 -04:00
Dmitry Kuzmenko
b8c0d1782c
Changed the now deprecated .postinitio to ._prepare
2015-05-27 21:28:08 +03:00
Nicole Thomas
2303dec0e9
Merge pull request #24181 from jtand/file_test
...
Fixed error where file was evaluated as a symlink in test_absent
2015-05-27 12:26:28 -06:00
Nicole Thomas
a16276852b
Merge pull request #24180 from terminalmage/fix-libvirt-test
...
Skip libvirt tests if not running as root
2015-05-27 12:18:47 -06:00
Tyler Cipriani
8ec82b640d
Update salt vagrant provisioner info
...
Also tweaked one piece of confusing verbiage
2015-05-27 11:13:29 -07:00
Nicole Thomas
9d7331c87d
Merge pull request #24178 from rallytime/bp-24118
...
Backport #24118 to 2014.7, too.
2015-05-27 11:49:45 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
pengyao
722a662479
fixed a typo
2015-05-27 11:25:28 -06:00
pengyao
565eb46ff5
Add cmd doc for WheelClient
2015-05-27 11:25:28 -06:00
