valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
45,469 Commits 24 Branches 182 Tags 341 MiB
abf00abea4
Commit Graph

45469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
b579bf2849 Merge pull request #20876 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-02-20 16:05:41 -07:00
Thomas S Hatch
44cda29411 Remove requisites from listen post calls 
We don't want to evaluate requsites at this point, also the running
dict is not available when doing listen post calls so we don't need
these anyway
 2015-02-20 15:51:34 -07:00
rallytime
b4b25b156f Pylint fix for 2015.2 2015-02-20 15:30:12 -07:00
Thomas S Hatch
626e13a211 fix bug from systems without any legacy init scripts 2015-02-20 15:22:22 -07:00
Colton Myers
c3b7be0655 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/topics/installation/rhel.rst
	salt/output/__init__.py
	salt/utils/__init__.py
 2015-02-20 13:51:59 -07:00
Nicole Thomas
abda600001 Merge pull request #20866 from terminalmage/issue20742 
Update the RHEL installation guide
 2015-02-20 13:37:23 -07:00
Aditya Kulkarni
42cc1b31b4 Merge pull request #20871 from pass-by-value/event_return_string 
Make sure event data is string (varchar)
 2015-02-20 15:02:41 -05:00
Aditya Kulkarni
885df658b5 Make sure event data is string (varchar) 2015-02-20 15:01:22 -05:00
Joseph Hall
28e51e4ba6 Need to pass POST data to urllib2 2015-02-20 11:33:35 -07:00
Thomas S Hatch
6d8b140383 Merge pull request #20838 from jfindlay/bp-20774 
Backport #20774 to 2015.2
 2015-02-20 11:21:42 -07:00
Erik Johnson
396e234848 Update the RHEL installation guide 
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.

Additionally, it provides better instructions on how to enable EPEL:

- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
  EPEL mirror. This is not a good idea since A) the mirror could go
  away, and B) we are unfairly sending people to a single mirror when
  the Fedora Project has a perfectly good link on their wiki to send
  people to a "random" mirror. The install example now uses these links.
 2015-02-20 11:59:19 -06:00
Joe Gillotti
8dbfed664d Don't remount loop back filesystems upon every state run 2015-02-20 11:03:07 +00:00
jfindlay
ca79845b2f Merge pull request #20848 from rallytime/new_requisites_tests 
Integration tests for the new requisites added in 2014.7
 2015-02-19 18:29:00 -07:00
Nicole Thomas
c9b766c0f3 Merge pull request #20847 from rallytime/state_kwargs 
Add listen and listen_in to state internal kwargs
 2015-02-19 16:43:50 -07:00
Joseph Hall
dd231ad06d Return actual instance data 2015-02-19 16:28:35 -07:00
Joseph Hall
80f572645b Auto-lookup image UUID, and assign as name 2015-02-19 16:13:32 -07:00
rallytime
c3f786c966 listen and listen_in requisite tests 2015-02-19 16:13:23 -07:00
Joseph Hall
0947790711 Switch to updated image list 2015-02-19 16:02:05 -07:00
rallytime
5d22cba10c Add listen and listen_in to state internal kwargs 2015-02-19 15:54:28 -07:00
Joseph Hall
0ff1d027ab Add Joyent keyname note to release notes 2015-02-19 14:55:13 -07:00
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
Shane Lee
0dabf0d576 Merge pull request #20845 from rallytime/bp-20655 
Backport #20655 to 2015.2
 2015-02-19 14:49:03 -07:00
rallytime
1437c9a1f5 onfail and onfail_in requisite tests 2015-02-19 14:35:26 -07:00
Joseph Hall
52de0f61f9 Linting 2015-02-19 14:22:52 -07:00
Joseph Hall
73194817ef Update Joyent to API version 7.2 2015-02-19 13:58:40 -07:00
Joseph Hall
337286b3b6 Switch Joyent to use salt.utils.cloud.bootstrap 2015-02-19 13:58:16 -07:00
Nicole Thomas
e0ba92f631 Merge pull request #20839 from rallytime/bp-20608 
Backport #20608 to 2014.7
 2015-02-19 13:07:45 -07:00
rallytime
208b4906d8 Onchanges and onchanges_in requisite tests! 2015-02-19 13:06:38 -07:00
Nicole Thomas
2ef28c7e45 Merge pull request #20842 from thatch45/state_kwargs 
Add requisite ins to state internal kwargs
 2015-02-19 13:06:07 -07:00
Samuel M Smith
b710bc2856 Support for Raet 0.6.0 with enums 2015-02-19 12:34:31 -07:00
Thomas S Hatch
97cda220fa Add requisite ins to state internal kwargs 2015-02-19 12:13:37 -07:00
Mike Place
e4ced3e783 Avoid trying to deserialize empty files 
This fixes errors encountered by the minion where an attempt to read an empty file from the cache will produce msgpack exceptions in the log.
 2015-02-19 11:01:05 -07:00
jfindlay
e488572610 Merge pull request #20834 from peresadam/fix_format_call_2014.7 
Fixed dict unpacking in salt.utils.format_call
 2015-02-19 10:41:24 -07:00
jfindlay
3f42cf3ea9 Merge pull request #20831 from RobertFach/fix-20828-mount-nointr 
added nointr invisible mount option
 2015-02-19 10:40:24 -07:00
Mike Place
9c225cb84d ZeroMQ socket monitoring 
This allows a user to log connection events from a ZeroMQ socket to better diagnose connectivity issues. Requires ZeroMQ 4.x.

Conflicts:
	salt/minion.py
 2015-02-19 10:18:27 -07:00
Thomas S Hatch
7d44aaad0b Merge pull request #20613 from jfindlay/fix_output 
change incorrect 'text' outputter to 'txt'
 2015-02-19 10:15:17 -07:00
Adam Peres
b50497b380 Fixed dict unpacking in salt.utils.format_call 2015-02-19 17:29:48 +01:00
Robert Fach
6855ca1844 added nointr invisible mount option 2015-02-19 16:07:38 +00:00
rallytime
8f0e80bd66 Add one onchanges requisite test 2015-02-18 17:16:07 -07:00
Mike Place
71ccd5e51a Merge pull request #20813 from rallytime/arch_installation_docs 
Update Arch installation docs to reference salt-zmq and salt-raet pkgs
 2015-02-18 16:25:46 -07:00
rallytime
9322d3b307 Update Arch installation docs to reference salt-zmq and salt-raet pkgs 2015-02-18 16:22:46 -07:00
jfindlay
f669b25211 Merge pull request #20810 from rallytime/windows_install_docs_update 
Add 2014.7.2 package links to the windows installer docs
 2015-02-18 14:54:47 -07:00
Thomas S Hatch
2fee16b26f Merge pull request #20802 from jfindlay/2015.2 
Merge 2014.7 into 2015.2
 2015-02-18 14:01:30 -07:00
rallytime
928bb30a6b Add 2014.7.2 package links to the windows installer docs 2015-02-18 13:55:26 -07:00
jfindlay
da186a0fac Merge pull request #20801 from rallytime/bp-20713 
Backport #20713 to 2015.2
 2015-02-18 12:21:59 -07:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2 
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
 2015-02-18 11:33:10 -07:00
Fred Reimer
db4fc06c43 fix pylint spacing, plus sig2 uses provider, not prov_dict 2015-02-18 11:22:08 -07:00
Fred Reimer
d2d642d4db global not needed in sig2 and sig4 2015-02-18 11:22:08 -07:00
Fred Reimer
5fdb7bfb8c Bad cut and paste, use providers instead of prov_dict 2015-02-18 11:22:08 -07:00
Fred Reimer
f49d7e1330 Added Fred Reimer to AUTHORS 2015-02-18 11:22:08 -07:00