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

54855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
c3fcef0d8a Merge pull request #24590 from dmyerscough/riak-features 
Additional riak functions
 2015-06-17 13:03:19 -06:00
Thomas S Hatch
6e78a55d3e Merge pull request #24741 from CameronNemo/upstart-enable-fix 
Improve Upstart enable/disable handling
 2015-06-17 11:59:22 -07:00
Mike Place
3ff6eff546 Merge pull request #24632 from jacobhammons/bug-fixes 
Doc bug fixes
 2015-06-17 12:40:02 -06:00
Mike Place
e99863cd1d Merge pull request #23105 from ngrennan-inflection/salt-ssh-return-code 
Fixing return code to be "1" instead of 0 when the return code of a run is something other than 0
 2015-06-17 12:37:23 -06:00
Mike Place
f5e0ee1d34 Merge pull request #24762 from cachedout/boron_notes 
Add Boron release notes
 2015-06-17 12:30:11 -06:00
Mike Place
ae65d78cf4 Add Boron release notes 2015-06-17 12:29:49 -06:00
Mike Place
e6dcf3ab12 Merge pull request #24703 from mattmb/fix/onchanges-and-or 
Multiple onchanges requisite behaviour
 2015-06-17 12:26:39 -06:00
Mike Place
9995f64428 Merge pull request #24607 from garethgreenaway/2015_5_sending_events_multi_master 
fixes to minion.py
 2015-06-17 12:16:42 -06:00
Mike Place
9b3ec4baa7 Merge pull request #24757 from cachedout/fix_pyobjects 
Fix loader call in pyobjects
 2015-06-17 11:59:29 -06:00
Justin Findlay
7f01edab76 Merge pull request #24756 from rallytime/fix_setup_develop 
Remove SALT_CLOUD_REQS from setup.py --> develop
 2015-06-17 11:42:51 -06:00
Justin Findlay
bf2dd94389 Merge pull request #24755 from rallytime/fix_setup_15 
Remove SALT_CLOUD_REQS from setup.py
 2015-06-17 11:42:25 -06:00
Mike Place
7b8609b6aa Merge pull request #24760 from cachedout/issue_24084 
Fix GPG in #24084
 2015-06-17 11:33:17 -06:00
Mike Place
d6227bda96 Merge pull request #24084 from quantonganh/gpg-module-import-key 
gpg module: fix result checking of import_key()
 2015-06-17 11:32:51 -06:00
Cameron Norman
f3078174c8 Add missing import 2015-06-17 10:30:47 -07:00
Mike Place
a2f5b646ad Switch to get to fix failing test 2015-06-17 11:30:08 -06:00
Cameron Norman
26e406a5ce salt.modules.upstart: fix lint errors 2015-06-17 10:18:35 -07:00
Thomas S Hatch
999e6f7535 Merge pull request #24743 from The-Loeki/udevmodule 
Contribution: Addition of udev information module
 2015-06-17 10:18:01 -07:00
Mike Place
d877f4f775 Merge pull request #23383 from cachedout/remove_overstate 
Overstate is dead. Long live orchestrate!
 2015-06-17 11:14:52 -06:00
Mike Place
dab4eccd00 Remove overstate tests 2015-06-17 11:14:19 -06:00
Mike Place
6ff1468a84 Merge pull request #24706 from jacksontj/develop 
Fix #23289 Workaround for pyzmq's inability to unregister sockets sometimes
 2015-06-17 11:01:10 -06:00
Mike Place
091725d5ca Merge pull request #24679 from cachedout/issue_24665 
Include data in highstate outputter
 2015-06-17 10:59:35 -06:00
Mike Place
909c1a2037 Lint 2015-06-17 10:59:18 -06:00
Thomas S Hatch
3d53d79476 Merge pull request #24740 from rallytime/bp-24720 
Backport #24720 to 2015.5
 2015-06-17 09:43:37 -07:00
Thomas S Hatch
ac2851be55 Merge pull request #24723 from rallytime/bp-20124 
Back-port #20124 to 2015.5
 2015-06-17 09:43:20 -07:00
Thomas S Hatch
f51bb58b83 Merge pull request #24720 from TheScriptSage/develop 
Issue 24621 - AD/LDAP Group Auth Issue
 2015-06-17 09:43:08 -07:00
Thomas S Hatch
4e63e571e2 Merge pull request #24707 from rallytime/linode_rest 
Move Linode driver to use REST API instead of libcloud/python-linode
 2015-06-17 09:42:57 -07:00
Mike Place
1aab1bde56 Fix loader call in pyobjects 2015-06-17 10:17:47 -06:00
Nicole Thomas
78cd09b6e9 Merge pull request #24754 from alprs/docs-add_linode_location_option 
salt-cloud documentation - Add information about linode location
 2015-06-17 10:04:48 -06:00
rallytime
9a6b159422 Remove SALT_CLOUD_REQS from setup.py --> develop 
Since requirements/cloud.txt was removed, don't reference it in setup.py
 2015-06-17 10:00:17 -06:00
rallytime
48769a544d Remove SALT_CLOUD_REQS from setup.py 
Since cloud-requirements.txt was removed, don't reference it in setup.py
 2015-06-17 09:56:13 -06:00
Andreas Lutro
d88e071e98 add information about linode location 2015-06-17 17:43:08 +02:00
Justin Findlay
2cfaae72e6 Merge pull request #24749 from obestwalter/patch-1 
add windows specfic default for multiprocessing
 2015-06-17 09:42:20 -06:00
Justin Findlay
d5554f76ec Merge pull request #24748 from jayeshka/serverdensity_device-states-unit-test 
adding states/serverdensity_device unit test case.
 2015-06-17 09:39:07 -06:00
Justin Findlay
0b7e7ef879 Merge pull request #24739 from rallytime/bp-24735 
Back-port #24735 to 2015.5
 2015-06-17 09:16:47 -06:00
Oliver Bestwalter
027bb2da76 add windows specfic default for multiprocessing 
multiprocessing has to be set to false on windows and should be done automatically like it is done with ipc_mode
 2015-06-17 14:41:32 +02:00
Jayesh Kariya
1a4c241050 adding states/serverdensity_device unit test case. 2015-06-17 16:50:40 +05:30
Ronald van Zantvoort
07da991cc2 CopyPasteFix is a difficult workflow 2015-06-17 12:33:34 +02:00
Ronald van Zantvoort
74250d506c Doc fixes for udev 2015-06-17 12:22:53 +02:00
Ronald van Zantvoort
e8c7ebd1be Addition of udev information module 2015-06-17 11:28:12 +02:00
Cameron Norman
03278bd973 Improve Upstart enable/disable handling 
* Properly search for manual stanza instead of just override
* Handle "manual" stanzas in both override and regular conf files
* Do not try to disable/enable already enabled services
* Do not overwrite override files (use append) on disable
* Only delete empty override files on enable
 2015-06-17 00:51:28 -07:00
Robert Davis
a9bcdb5b77 Updating master.py to properly check against groups when user 
is only authed against group.  Tested against unit.auth_test.

Fixed multiple pylint issues in my own code as well.
 2015-06-16 21:53:28 -06:00
rallytime
64c565d9be Add .0 to version number 2015-06-16 21:49:43 -06:00
Peter Tripp
5ed801b98f Add codenames for 2015.5 and future versions. Trailing newline. 2015-06-16 21:48:41 -06:00
Justin Findlay
4cbef0f7e4 Merge pull request #24735 from notpeter/develop 
Add 2015.5 codename to version numbers docs
 2015-06-16 21:31:08 -06:00
Justin Findlay
c8713f2d00 Merge pull request #24732 from msteed/issue-24111 
Fix stacktrace when `--summary` is used
 2015-06-16 21:27:57 -06:00
Justin Findlay
70d37816bf Merge pull request #24721 from rallytime/bp-24668 
Back-port #24668 to 2015.5
 2015-06-16 21:23:47 -06:00
Justin Findlay
1b9d6895c7 Merge pull request #24718 from rallytime/update_vsphere_docs 
Added some missing config documentation to the vsphere driver
 2015-06-16 21:19:35 -06:00
Justin Findlay
023b1717bd Merge pull request #24717 from gthb/issue-24716 
virtualenv.managed: document user and no_chown
 2015-06-16 21:19:11 -06:00
Justin Findlay
b67742d4a1 Merge pull request #24715 from rallytime/remove_cloud_reqs_develop 
Remove requirements/cloud.txt
 2015-06-16 21:17:25 -06:00
Justin Findlay
64857c706d Merge pull request #24714 from rallytime/remove_cloud_reqs_15 
Remove cloud-requirements.txt
 2015-06-16 21:17:04 -06:00