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
69,145 Commits 24 Branches 182 Tags 341 MiB
2934fc1a57
Commit Graph

69145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Seth House
2934fc1a57 Doc cherrypy deemphasize urlencoded (#36047) 
* Reword and clarify usage, clients & arg/kwarg, and content negotiation

* Replace all urlencoded examples with JSON examples

Using urlencoded format is a fast shorthand at the CLI with curl but it
should really be avoided for any real work. It requires having to know a
lot about the limitations and use of the format, and for complex tasks
it requires knowing a lot about how Salt's CLI `name=val` string parsing
works. It causes a lot of confusion and support issues and it should be
the exception, not the rule.

* Add one more mention of the full list of client interfaces
 2016-09-06 10:18:52 -06:00
Nicole Thomas
74143999d3 Merge pull request #36039 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-02 15:50:47 -06:00
rallytime
5f499cfd41 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-02 15:00:55 -06:00
Nicole Thomas
1d90c42142 Back-port #35824 to 2016.3 (#36038) 
* Add more documentation to the wheel key module

Fixes #35683

* Shorten some of the pub/priv key documentation examples.
 2016-09-02 14:58:27 -06:00
Daniel Wallace
65b6734c04 catch unicode encoding errors in json outputter (#36033) 
Add testing too
 2016-09-02 14:56:09 -06:00
Elias Probst
822481ef9e modules.service: Do not default to OpenRC on Gentoo, also allow systemd (#36010) 2016-09-02 14:54:40 -06:00
Thomas S Hatch
1b39c7ed48 Merge pull request #35978 from DSRCorporation/bugs/28462_update_auth_data_on_reauth 
Update auth data on reauth.
 2016-09-02 14:46:55 -06:00
Nicole Thomas
b68d293f86 fix redis_return's clean_old_jobs. (#36014) 
Refs #33969
 2016-09-02 14:37:27 -06:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Nicole Thomas
b652271ddc Fix type error in networkfbsd osmajorrelease compare (#36016) 2016-09-02 14:36:41 -06:00
Nicole Thomas
bc81818075 Merge pull request #36018 from meaksh/bp-36000-to-2015.8 
Back-port #36000 to 2015.8
 2016-09-02 14:34:55 -06:00
Nicole Thomas
e88df5845d Merge pull request #36019 from meaksh/bp-36000-to-2016.3 
Back-port #36000 to 2016.3
 2016-09-02 14:34:30 -06:00
Thomas S Hatch
b9fc51a172 Fix error when profiling is turned on and minions don't return (#36028) 
* Fix error when profiling is turned on adn minions don't return

* Another try
 2016-09-02 14:30:39 -06:00
Seth House
20a361d1f3 Add include_* kwargs to the *_dict key functions (#36030) 2016-09-02 14:16:00 -06:00
Mike Place
cd60ec5d57 Merge pull request #36024 from DSRCorporation/bugs/31454_local_client_memleak 
Don't subscribe to events if not sure it would read them.
 2016-09-03 00:41:01 +09:00
Nicole Thomas
32d5f896d4 Merge pull request #36023 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-02 09:37:59 -06:00
Dmitry Kuzmenko
01911c530e Don't subscribe to events if not sure it would read them. 
Reactor uses LocalClient to send message but do not read events that
produces memory leak in EventPublisher: sent messages are collected
there in the IOStream class.
 2016-09-02 17:20:30 +03:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
e6b93c2380 Merge pull request #36022 from saltstack/revert-33770-service_tests 
Revert "service state integration tests"
 2016-09-02 21:38:36 +09:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
rallytime
1b2abeabd1 Lint for #35916 
Merges #35916
 2016-09-02 11:24:13 +01:00
Eric Jackson
8b4f46fbd0 Check for single quote before splitting on single quote 
Signed-off-by: Eric Jackson <ejackson@suse.com>
 2016-09-02 11:24:13 +01:00
rallytime
8c05d2aac5 Lint for #35916 
Merges #35916
 2016-09-02 11:23:06 +01:00
Eric Jackson
b5fe6100ee Check for single quote before splitting on single quote 
Signed-off-by: Eric Jackson <ejackson@suse.com>
 2016-09-02 11:23:03 +01:00
Nicole Thomas
d248ab0120 Merge pull request #36004 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-01 15:11:05 -06:00
rallytime
318bffed1d Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-01 14:27:07 -06:00
Erik Johnson
678f10cf8b Avoid traceback in mac_user.py when user.chhome is invoked from a user state (#35901) 
* mac_user.py: Avoid traceback in chhome func

* Add warning about lack of Windows/Mac support for createhome
 2016-09-01 11:44:47 -06:00
Mike Place
f7b85cb70b Merge pull request #35952 from twangboy/fix_win_runas_2016.3 
Load UserProfile when using RunAs (2016.3)
 2016-09-02 00:18:15 +09:00
Mike Place
2da501071e Merge pull request #35967 from twangboy/improve_show_sls_2015.8 
Allow full path to be passed to show_sls (2015.8)
 2016-09-01 23:54:55 +09:00
Mike Place
d86fba15b3 Merge pull request #35981 from cachedout/cptestcase_license 
Update Salt's licensing information to include cptestcase
 2016-09-01 23:48:45 +09:00
Mike Place
dd562dd200 Update Salt's licensing information to include cptestcase 
From https://github.com/adamhajari/spyre/blob/master/LICENSE.txt
 2016-09-01 18:46:13 +09:00
Dmitry Kuzmenko
778ae9a9ff Update auth data on reauth. 
If minion reauth in a subprocess, like scheduler jobs, update the auth
data in the main process by sending and handling a local event.
 2016-09-01 11:59:45 +03:00
Nicole Thomas
b8ca3f5e4d Merge pull request #35959 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-31 16:14:54 -06:00
twangboy
2ed9a82ef8 Allow full path to be passed to show_sls 2016-08-31 15:31:39 -06:00
rallytime
bb4605ffee Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-31 15:13:45 -06:00
Jacob Hammons
0f0f15d048 Merge pull request #35956 from jacobhammons/dot12 
Version docs to 2015.8.12
 2016-08-31 14:39:35 -06:00
Jacob Hammons
3e21e35933 Version docs to 2015.8.12 2016-08-31 14:38:16 -06:00
Jacob Hammons
a87b91a8ea Merge pull request #35955 from jacobhammons/dot3 
Version docs to 2016.3.3
 2016-08-31 14:35:55 -06:00
Jacob Hammons
ac8fe6ff9e Version docs to 2016.3.3 2016-08-31 14:34:55 -06:00
twangboy
3721a09ea3 Load UserProfile on RunAs 2016-08-31 13:57:27 -06:00
Daniel Wallace
d2db4ea7a2 cachedir should be /cloud not /master (#35897) 
Fixes #35893
 2016-08-31 10:38:43 -06:00
Jacob Hammons
9910b9c6f9 Fix incremental doc builds - OS X, postgres returner, tcp transport doc updates (#35865) 
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport

* Generate copyright date
Footer updates
 2016-08-31 09:51:36 -06:00
Andres Montalban
24f9d3397c Speed up FreeBSD pkg install process for pkg.latest since pkg command by default tries to update repository DB on each search: (#35904) 
https://www.freebsd.org/cgi/man.cgi?query=pkg-search&sektion=8&apropos=0&manpath=FreeBSD+10.3-RELEASE+and+Ports
 2016-08-31 09:46:13 -06:00
Denys Havrysh
b87e4f1e85 Salt Cloud: add centos default user for official CentOS AMIs (#35931) 2016-08-31 09:41:55 -06:00
Nicolas Delaby
580e0d4aa7 Mention that docker image names must be given with repository (#35926) 2016-08-31 09:26:13 -06:00
Mike Place
ca06c62900 Merge pull request #35868 from rallytime/fix-35825 
Add more helpful return messages for drac runner
 2016-08-31 10:33:27 +09:00
Erik Johnson
f4cdcc0d66 Better logging when file_recv_max_size is exceeded (#35914) 
This gives more information on what to do when this limit is exceeded.
 2016-08-30 14:03:02 -06:00
Nicole Thomas
95b89dbce9 Merge pull request #35903 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 into 2016.3
 2016-08-30 11:15:36 -06:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
rallytime
00ae17248e Update error message to be more helpful and fix doc formatting 2016-08-30 10:09:59 -06:00