valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,441 Commits 24 Branches 182 Tags 341 MiB
f60f26da67
Commit Graph

59441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
51a0193b54 Merge pull request #27244 from garethgreenaway/ec2_create_snapshot_no_return_data_exception 
Exception in cloud.ec2.create_snapshot
 2015-09-18 15:41:11 -06:00
Mike Place
e4a5b004ae Merge pull request #27241 from jfindlay/yumwarn 
osrelease is only an integer for fedora
 2015-09-18 15:40:50 -06:00
FELD Boris
6417161fd7 The CORS implementation was a bit naive about headers allowance. 
A preflight request send the list of headers of the final request
in a special header ```Access-Control-Request-Headers```.
The server must returns the list of allowed header in the special header
```Access-Control-Allow-Headers```.

This PR just returns the whole list of headers but may allow filtering of some
of them quite easily. I'm not sure to see how filtering how headers may
impact security, if anyone has some leads.
 2015-09-18 23:24:43 +02:00
Aaron S.
13f5f7bb3e default log_level is info, not warning 
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
 2015-09-18 13:59:45 -07:00
Aaron S.
3d866f773d log_level default is info 
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
 2015-09-18 13:59:01 -07:00
Justin Findlay
f8e71f6d7d Merge pull request #27234 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-18 14:41:38 -06:00
Riccardo Ghetta
05bb8a332d fix lint complaint 2015-09-18 22:24:07 +02:00
Nicole Thomas
b0cf993dbd Merge pull request #9 from jtand/cloud-logging-develop 
Fixed some index numbers to fix some errors.
 2015-09-18 14:15:05 -06:00
justinta89
1e1435ccb8 Fixed some index numbers to fix some errors. 2015-09-18 14:12:27 -06:00
Justin Findlay
2d6c75cbd7 Merge pull request #27240 from isbm/isbm-pkg.info-tz-bugfix-backport-2015.8 
Backport of the fix of 'pkg.info*' for Beryllium
 2015-09-18 14:02:15 -06:00
Justin Findlay
c9255f2bbd Merge pull request #27236 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-18 13:55:49 -06:00
Justin Findlay
77a1e7b7b6 Merge pull request #27235 from isbm/isbm-pkg.info-tz-bugfix 
Timezone fix for the `pkg.info`
 2015-09-18 13:52:44 -06:00
Justin Findlay
80a45b74ed Merge pull request #27223 from M2Mobi/zone 
Support firewalld per interface zone config on rh7 systems
 2015-09-18 13:44:45 -06:00
Gareth J. Greenaway
4955bfd063 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID 2015-09-18 12:44:13 -07:00
Justin Findlay
28155ef63a Merge pull request #27218 from eyj/fix-27217 
fixes #27217 clear_old_remotes clears wrong directory (gitfs)
 2015-09-18 13:43:49 -06:00
Justin Findlay
1054928234 Merge pull request #27213 from macgyver13/patch-1 
Make get_event compatible with salt/client
 2015-09-18 13:38:15 -06:00
Colton Myers
652b2998af Merge pull request #27238 from bechtoldt/fix_disk_percent_keyerror 
salt.modules.disk.percent() throws KeyError when partition doesn't exist
 2015-09-18 13:37:00 -06:00
Gareth J. Greenaway
820fd576b9 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID 2015-09-18 12:21:36 -07:00
rallytime
4b0f7cce1d If two ssh keynames are found in DigitalOcean, abort. 
Fixes #25079
 2015-09-18 13:18:40 -06:00
Nicole Thomas
3444c81d92 Merge pull request #8 from jtand/cloud-logging-develop 
Fixed bug where logging_command wasn't set as key in a couple spots.
 2015-09-18 12:58:49 -06:00
justinta89
79f403519a Fixed bug where logging_command wasnt set as key in a couple spots. 2015-09-18 12:56:22 -06:00
Justin Findlay
1f7570250f osrelease is only an integer for fedora 
Fixes #27065.
 2015-09-18 12:50:47 -06:00
Mike Place
26540f15bc Merge pull request #27231 from jfindlay/cronchange 
only write cron file if it is changed
 2015-09-18 12:23:09 -06:00
Mike Place
a11806e049 Merge pull request #27230 from benhosmer/develop 
Fix typo in AWS doc config
 2015-09-18 12:22:34 -06:00
Arnold Bechtoldt
0511f611bb prevent KeyError by checking whether partition even exists 2015-09-18 19:47:23 +02:00
Bo Maryniuk
8fb2940a2d Return install date only if possible. 2015-09-18 19:26:22 +02:00
Bo Maryniuk
19a361851a Return install date only if possible. 2015-09-18 19:25:39 +02:00
Bo Maryniuk
ff857bc8aa Return RPM package time in UTC timezone 2015-09-18 19:21:12 +02:00
Bo Maryniuk
eaa0f370bf Remove time fraction and return ISO in UTC 2015-09-18 19:21:05 +02:00
Bo Maryniuk
ce9570fce6 Return UTC timestamp for modification of path. 2015-09-18 19:20:58 +02:00
FELD Boris
a4fd1e75c5 Add the support of login payload in JSON and YAML. 
Login endpoint supported only application/x-www-form-urlencoded which may
be an useless limitation. This PR add support for more content-type,
JSON and YAML and every content-type supported by saltnado in general
as it uses the same deserialisation method than the lowstate deserialisation.
 2015-09-18 19:16:47 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Colton Myers
be2b0fc497 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/utils/http.py
 2015-09-18 10:57:28 -06:00
Bo Maryniuk
159fce9f31 Return RPM package time in UTC timezone 2015-09-18 18:55:57 +02:00
Colton Myers
579f375f74 Merge pull request #27233 from basepi/release.notes.stubs 
[2015.5] Add stub release notes for 2015.5.6
 2015-09-18 10:55:40 -06:00
Bo Maryniuk
f3fa7bc405 Remove time fraction and return ISO in UTC 2015-09-18 18:55:04 +02:00
Colton Myers
f4563ea9b7 Add stub release notes for 2015.5.6 2015-09-18 10:54:15 -06:00
Colton Myers
253ac5e0c3 Merge pull request #27232 from basepi/release.notes.stubs 
[2015.8] Add stub release notes for 2015.8.1
 2015-09-18 10:53:01 -06:00
Colton Myers
25410706ee Add stub release notes for 2015.8.1 2015-09-18 10:51:54 -06:00
Colton Myers
f5a322e3f2 Merge pull request #27208 from basepi/nop.state.25423 
[2015.5] Add test.nop state
 2015-09-18 10:50:17 -06:00
Colton Myers
9414b05b2c Add test.nop example 2015-09-18 10:49:45 -06:00
Justin Findlay
1e335297e2 only write cron file if it is changed 
Fixes #27215.
 2015-09-18 10:42:58 -06:00
Ben Hosmer
5393751332 Fix typo in AWS doc config 2015-09-18 12:21:37 -04:00
Mike Place
59a07cae68 Merge pull request #27201 from jfindlay/sshhash 
rename hash_hostname to hash_known_hosts
 2015-09-18 09:45:03 -06:00
Mike Place
c542cd49d0 Merge pull request #27199 from rallytime/fix-24573 
Avoid RunTimeError (dictionary changed size during iteration) with keys()
 2015-09-18 09:44:27 -06:00
Mike Place
ee0824987e Merge pull request #27204 from rallytime/cloud-cleanup 
Small cloud clean up
 2015-09-18 09:43:52 -06:00
Mike Place
560545c4c5 Merge pull request #27214 from jacksontj/2015.5 
Correctly support https, port 443 is not a requirement
 2015-09-18 09:43:05 -06:00
Mike Place
e7a929b4e8 Merge pull request #27221 from eyj/enh-create_image 
Create AMI from instance and query AMIs
 2015-09-18 09:42:51 -06:00
Joseph Hall
6b79ad69a9 Merge pull request #27206 from rallytime/gce-doc-cleanup 
Don't repeat GCE setup instructions, and make the use of .json files clearer
 2015-09-18 08:38:39 -06:00
Joseph Hall
1d022eb5de Merge pull request #27210 from rallytime/do-clean-up 
Refactor some digital ocean functions
 2015-09-18 08:38:01 -06:00