Thibault Cohen
4a0040c1b4
[Doc] Add note for SVN state
...
Doc addition: SVN state needs subversion package installed
2015-12-02 08:33:14 -07:00
Colton Myers
14e94b3593
Merge pull request #29316 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-12-01 13:20:23 -07:00
Colton Myers
33f40b3c47
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-12-01 13:19:39 -07:00
Mike Place
d2fb2109a3
Merge pull request #29296 from douardda/patch-3
...
Use process KillMode on Debian systems also
2015-12-01 09:00:16 -07:00
David Douard
d2885390f4
Use process KillMode on Debian systems also
...
closes #29295
2015-12-01 11:16:06 +01:00
Mike Place
6a2ffbfb7c
Merge pull request #29216 from clan/file_search_on_proc_file
...
size is 0 doesn't mean no data, e.g, /proc/version
2015-11-30 13:01:43 -07:00
Mike Place
d6aaae8d7b
Merge pull request #29261 from attiasr/patch-1
...
fix incorrect reinstallation of windows pkg
2015-11-30 11:28:42 -07:00
Rudy Attias
7a99b90596
add log and return if pkg already installed
2015-11-30 11:33:14 +02:00
Rudy Attias
1843c7ab8e
fix incorrect reinstallation of windows pkg
...
"old" holds list_pkgs results which have the mapped application name as the key so when trying to find the installed version old.get() will return none with the 'full_name' of the app but it will return the installed version with mapped package name.
2015-11-30 11:21:23 +02:00
Z. Liu
91a20c07a1
try mmap first
2015-11-27 21:48:57 +08:00
Z. Liu
8aa4f2053e
remove extra space to fix lint failure
2015-11-27 10:55:45 +08:00
Z. Liu
d34e6b1a9a
use read only if has read() method
2015-11-27 08:02:02 +08:00
Z. Liu
3209c1cdb5
size is 0 doesn't mean no data, e.g, /proc/version
2015-11-26 13:01:01 +08:00
Justin Findlay
9236188867
Merge pull request #29214 from cro/ssl_verify_ssl
...
Doc for salt.utils.http should say verify_ssl not ssl_verify.
2015-11-25 16:55:38 -07:00
C. R. Oldham
e9c13c561b
Doc bug--salt.utils.http takes verify_ssl not ssl_verify.
2015-11-25 15:57:31 -07:00
Mike Place
df7b35a86b
Merge pull request #29204 from lorengordon/fix-29202
...
Use os.path.join to return full path to ca bundle
2015-11-25 13:00:42 -07:00
Loren Gordon
b1dae5e6fe
Use os.path.join to return full path to ca bundle
...
Fixes #29202
2015-11-25 13:34:44 -05:00
Justin Findlay
a26c10a811
Merge pull request #29164 from jfindlay/bp-29113
...
Backport #29113
2015-11-24 14:26:17 -07:00
Mark McGuire
50fab35188
kill unneeded import
2015-11-24 13:28:31 -07:00
Justin Findlay
4f03196e7d
Merge pull request #29138 from jfindlay/2015.5
...
add 2015.5.8 release notes
2015-11-23 16:22:48 -07:00
Justin Findlay
be045f5cb1
add 2015.5.8 release notes
2015-11-23 16:21:45 -07:00
Colton Myers
219367a23d
Merge pull request #29128 from cachedout/tweak_29122
...
Set a safer default value for ret in saltmod
2015-11-23 10:07:40 -07:00
Mike Place
b08858b040
Missed check
2015-11-23 10:07:21 -07:00
Mike Place
584efe81ee
Set a safer default value for ret in saltmod
...
Tweak fix in #29122 after review with @basepi
2015-11-23 10:04:34 -07:00
Nicole Thomas
2250a36647
Merge pull request #29122 from cachedout/issue_29110
...
Fix broken state orchestration
2015-11-23 09:24:18 -07:00
Mike Place
4b9302d794
Fix broken state orchestration
...
This corrects an issue introduced in #28012 wherein the `m_ret` variable
was not set prior to evaluation. Here, we simply set it to None and then check for this type explicitely.
Fixes #29110
2015-11-23 08:09:54 -07:00
Nicole Thomas
200e771efb
Merge pull request #29096 from rallytime/bp-29093
...
Back-port #29093 to 2015.5
2015-11-22 10:02:50 -07:00
Xiuming Chen
f5734423a4
Compare gem versions as a string.
2015-11-21 08:41:06 -07:00
Nicole Thomas
d8a2018bc8
Merge pull request #29084 from rallytime/bp-29055
...
Back-port #29055 to 2015.5
2015-11-20 13:57:54 -07:00
Nicole Thomas
b5cff1a351
Merge pull request #29083 from rallytime/bp-29053
...
Back-port #29053 to 2015.5
2015-11-20 13:57:38 -07:00
Mike Place
52e650aed9
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Kevin London
f1884de0e7
Update rabbitmq_user.py
...
Corrected spacing to make it clear that the permissions were a level below the vhost name.
2015-11-20 09:21:22 -07:00
Thomas S Hatch
b3e3bebef0
Merge pull request #28932 from twangboy/fix_28928
...
Fixed user.present / user.absent in windows
2015-11-18 14:45:53 -07:00
Mike Place
a2e4a227e0
Merge pull request #29011 from rallytime/bp-28630
...
Back-port #28630 to 2015.5
2015-11-18 10:50:05 -07:00
Petr Messner
7baccc1b05
Lint - newline before def
2015-11-18 09:09:09 -07:00
Petr Messner
9e5c16d4da
Reading S3 credentials from Pillar
2015-11-18 09:09:09 -07:00
Petr Messner
a3216f813d
Fixed requests HTTPError handler, it was still in urllib2 style
2015-11-18 09:09:09 -07:00
Colton Myers
1a4cd6002f
Merge pull request #28982 from basepi/merge-forward-2015.5
...
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-17 17:49:32 -07:00
Colton Myers
bfbb109fbd
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
salt/fileclient.py
2015-11-17 16:15:48 -07:00
Mike Place
edd26d763a
Merge pull request #28949 from whiteinge/sync-sdb
...
Add sync_sdb execution function
2015-11-17 08:35:38 -07:00
Seth House
b0ec9ab25b
Add sync_sdb execution function
2015-11-16 23:54:09 -07:00
Thomas S Hatch
43da1bc4ce
Merge pull request #28930 from twangboy/fix_28888
...
Added missing import mmap required by file.py
2015-11-16 16:17:23 -07:00
twangboy
0653a04887
Fixed user.present / user.absent in windows
...
Fixes : #28928
Updated `states/user.py` to work with the backported win_useradd.py
This is a regression caused by: #28627
2015-11-16 14:51:16 -07:00
twangboy
f5c489eaad
Added missing import mmap required by file.py
2015-11-16 13:45:27 -07:00
Mike Place
2488b873b8
Merge pull request #28908 from rallytime/doc-convention-spelling
...
A couple of spelling fixes for doc conventions page.
2015-11-15 19:29:34 -07:00
rallytime
60e6eddb77
A couple of spelling fixes for doc conventions page.
2015-11-15 14:49:47 -07:00
Nicole Thomas
827a1ae020
Merge pull request #28902 from whiteinge/json-keys
...
Fix missing JSON support for /keys endpoint
2015-11-15 08:36:05 -07:00
Seth House
9745903301
Fix missing JSON support for /keys endpoint
...
Fixes #22442
2015-11-14 18:01:53 -07:00
Justin Findlay
d23bd49130
Merge pull request #28897 from rallytime/bp-28873
...
Back-port #28873 to 2015.5
2015-11-14 17:43:34 -07:00
Tehmasp Chaudhri
077e671ead
Fix salt-cloud help output typo
2015-11-14 08:15:10 -07:00
