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
61,884 Commits 24 Branches 182 Tags 341 MiB
4324189658
Commit Graph

61884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Huba
0889907b3c Make consul.list a function alias. 
Fixes #28712.
 2015-11-10 10:25:17 -05:00
Daniel Hobley
cb56200178 Removing uid and gid from windows minion grains as they are not supported 2015-11-10 13:56:04 +01:00
Dmitry Kuzmenko
1f1fe7bc5c Fix PyLint errors 2015-11-10 14:59:15 +03:00
Dmitry Kuzmenko
7681761320 Fixed cassandra_cql returner 2015-11-10 14:52:38 +03:00
Jarrod Moore
012d539b26 Add missing S3 module import 
In the get_url method, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported. This missing line breaks file.managed resources where source and source_hash attributes use s3:// URLs.
 2015-11-10 22:08:36 +11:00
Dmitry Kuzmenko
cdcf55efad Return dict from get_jids() in redis returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
77a3a1470d Return dict from get_jids() in pgjsonb returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
b39f9d0736 Return dict from get_jids() in mongo_future returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
5756771571 Return dict from get_jids() in etcd returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
eb1e82e637 Minor: syntax fix in memcache returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
107d7c3c67 Minor: typo in comment 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
a9d83199a6 Don't fail get_returner_options if ret arg is None 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
ca1aca5965 Return dict from get_jids() in influxdb returner 2015-11-10 12:55:35 +03:00
Dmitry
b5a204868a Fix memcache returner 
- removed completely wrong code (copypaste from redis)
- reimplemented get_fun
- removed exception handlers since memcache library don't throw errors
  anymore
- use more efficient get_multi
 2015-11-10 12:55:35 +03:00
Dmitry
3a4e8f80eb Return dict from get_jids() in memcache returner 2015-11-10 12:55:35 +03:00
Dmitry
38b7a6c227 Return dict from get_jids() in odbc returner 2015-11-10 12:55:35 +03:00
Dmitry
d614d6ad51 Return dict from get_jids() in postgres returner 2015-11-10 12:55:35 +03:00
Dmitry Kuzmenko
6eac772ad8 get_jids return dict for cassandra_cql, couchdb and sqlite3 returners. 2015-11-10 12:55:35 +03:00
akandavelu
f63cbd097f mysql_database.present should handle char set and collate properties of database 2015-11-10 15:13:38 +05:30
B M Corser
4cd30db2dc Decode some more filenames 2015-11-10 09:32:27 +00:00
Jorge Schrauwen
1118c54f43 apply new things learned while working on state modules to cleanup code 2015-11-10 08:43:13 +00:00
Gareth J. Greenaway
882350a543 Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. 2015-11-09 22:05:38 -08:00
Quan Tong Anh
b4a6339ab2 boto_vpc: return an empty dict in case cannot get the route tables 2015-11-10 07:19:51 +07:00
Colton Myers
8a23181dd7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/boto_secgroup.py
    salt/modules/rabbitmq.py
    salt/modules/win_system.py
    salt/modules/yumpkg.py
    salt/states/mount.py
 2015-11-09 17:05:43 -07:00
jacobhammons
decc31a766 Merge pull request #28719 from jacobhammons/spm 
removed dependencies info from docs
 2015-11-09 17:04:53 -07:00
Colton Myers
989069f44a Merge pull request #28709 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-11-09 16:38:27 -07:00
Seth House
ded5c151cd Merge pull request #28718 from sjmh/fix/cherrypy_null_post 
Account for no POST data
 2015-11-09 16:34:23 -07:00
Mike Place
f4fe921965 Merge pull request #28717 from cachedout/umask_note 
Add note about recommended umask
 2015-11-09 16:26:20 -07:00
Steve Hajducko
cbce857d7c Account for no POST data 
The serving.request doesn't include a raw_body when the POST data
is blank, so set it to an empty dict.

Also fixed a bug where we assumed that if data wasn't a list, it
was a dict, which bombs because null POSTS result in None.
 2015-11-09 15:23:06 -08:00
Jacob Hammons
d7017be031 removed dependencies info from docs 2015-11-09 16:07:17 -07:00
Mike Place
1874300e08 Add note about recommended umask 
Closes #28199
 2015-11-09 15:46:57 -07:00
Mike Place
32e7bd3ea0 Account for new headers class in tornado 4.3 
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
 2015-11-09 15:42:35 -07:00
Mike Place
8d5ab15c16 Merge pull request #28710 from rallytime/fix-28469 
Pass kwargs correctly to _get_group from get_group_id
 2015-11-09 15:29:09 -07:00
Colton Myers
2d04ddc108 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-09 15:28:14 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore 
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
 2015-11-09 15:22:01 -07:00
Steve Valaitis
80a706c0b9 prefer salt.ext.six.string_types for shlex_split 2015-11-09 14:22:07 -06:00
Robert Booth
791e161a8d Updated all messages to be less informal and adjusted to salt style guide. 2015-11-09 14:09:15 -06:00
rallytime
0571608f5d Pass kwargs correctly to _get_group from get_group_id 
Fixes #28469
 2015-11-09 12:34:36 -07:00
Pedro Algarvio
f40c617bad Merge pull request #28705 from cachedout/tornado_http_headers 
Account for new headers class in tornado 4.3
 2015-11-09 19:24:33 +00:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
 2015-11-09 12:12:24 -07:00
Mike Place
26fd2bc89e Merge pull request #28215 from s0undt3ch/features/signal-handling 
Proper signal handling
 2015-11-09 12:11:15 -07:00
Mike Place
fd571890b9 Merge pull request #28686 from jeanpralo/add-validate-dockercompose-get 
set a valid flag for docker-compose file  on get method
 2015-11-09 11:13:50 -07:00
Mike Place
46b5c24c05 Merge pull request #28697 from s0undt3ch/features/process-names 
Provide readable process names
 2015-11-09 11:13:22 -07:00
Mike Place
cfa0cec19c Merge pull request #28698 from rallytime/bp-28530 
Back-port #28530 to 2015.8
 2015-11-09 11:11:51 -07:00
Mike Place
604a7b4199 Merge pull request #28699 from rallytime/bp-28670 
Back-port #28670 to 2015.5
 2015-11-09 11:10:58 -07:00
Mike Place
2fe9e2e7c5 Merge pull request #28700 from rallytime/bp-28679 
Back-port #28679 to 2015.8
 2015-11-09 11:07:44 -07:00
C. R. Oldham
b86c614564 Better logic around fallback credentials. 2015-11-09 11:04:52 -07:00
Mike Place
7bd3eb8370 Merge pull request #28703 from rallytime/bp-28690 
Back-port #28690 to 2015.5
 2015-11-09 11:01:57 -07:00
Mike Place
7ac6cde1ee Account for new headers class in tornado 4.3 
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
 2015-11-09 10:56:12 -07:00
Nicole Thomas
668abdd9a5 Merge pull request #28696 from s0undt3ch/develop 
Update to latest bootstrap script v2015.11.09
 2015-11-09 10:50:35 -07:00