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
47,549 Commits 24 Branches 182 Tags 341 MiB
cd072876b7
Commit Graph

47549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Drapeau
4c6cdd6f05 Bug: OSError at master startup (https://github.com/saltstack/salt/issues/20872) 
salt/salt/utils/init.py", line 1057, in fopen
os.chown(path, uid, gid)
OSError: [Errno 1] Operation not permitted: '/var/cache/salt/master/roots/mtime_map'
 2015-02-20 21:08:18 -07:00
jfindlay
4619371028 Revert "try/except salt.utils.fopen chown of file" 2015-02-20 21:03:49 -07:00
Joe Hoyle
5d8ba4aac2 Trim the env base off the dest file path in the s3fs fileserver 2015-02-20 21:40:35 -05:00
Thomas S Hatch
aa96665a2b Merge pull request #20726 from claudiupopescu/boto-vpc-state 
Boto VPC state draft proposal
 2015-02-20 18:10:54 -07:00
Thomas S Hatch
093854f9cb Merge pull request #20627 from claudiupopescu/boto-rds-state 
Boto rds state draft
 2015-02-20 18:09:29 -07:00
Thomas S Hatch
ee62332d78 Merge pull request #20586 from claudiupopescu/boto-rds 
Boto rds module
 2015-02-20 18:08:36 -07:00
Thomas S Hatch
f522bb015d Merge pull request #20846 from techhat/joyent72 
Overhaul Joyent driver, mostly for new API
 2015-02-20 18:08:15 -07:00
Thomas S Hatch
740af3c8c7 Merge pull request #20870 from yesimon/merge_plists 
Use plist from pkg in launchd runner.
 2015-02-20 17:51:52 -07:00
Thomas S Hatch
6c4310734c Merge pull request #20883 from jfindlay/try_chown 
try/except salt.utils.fopen chown of file
 2015-02-20 17:47:27 -07:00
Justin Findlay
9178041d89 try/except salt.utils.fopen chown of file 
Fixes #20882.  If the file resides on a filesystem with immutable file
attributes, such as a network filesystem, then a chown operation will
fail.
 2015-02-20 16:48:21 -07:00
Nicole Thomas
30ece4ced4 Merge pull request #20879 from rallytime/pylint 
Pylint fix for 2015.2
 2015-02-20 16:12:03 -07:00
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
rallytime
b4b25b156f Pylint fix for 2015.2 2015-02-20 15:30:12 -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
Simon Ye
23f078d83a Use plist from pkg in launchd runner. 2015-02-20 14:46:51 -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
Thomas S Hatch
a920b851f3 Merge pull request #20835 from rallytime/merge-20782 
Merge #20782 with pylint fix
 2015-02-20 11:21:16 -07:00
Thomas S Hatch
1d6e932a20 Merge pull request #20861 from jayeshka/win_autoruns-unit-test 
adding win_autoruns unit test case
 2015-02-20 11:20:57 -07:00
Thomas S Hatch
7f18365cd7 Merge pull request #20853 from dunz0r/ipcidr-doc-fix 
Moved ipcidr-doc to ipcidr() instead of compound()
 2015-02-20 11:20:44 -07:00
Thomas S Hatch
90994722f0 Merge pull request #20843 from matdrapeau/16556/ImportError_custom_dep 
Adding current module directory to the sys.path when loading a module
 2015-02-20 11:20:32 -07:00
Thomas S Hatch
df0371ece4 Merge pull request #20822 from peresadam/fix_format_call 
Fixed dict unpacking in salt.utils.format_call
 2015-02-20 11:19:38 -07:00
Thomas S Hatch
dc3e6b14b9 Merge pull request #20821 from claudiupopescu/boto-vpc-describe-subnets 
Adds boto VPC describe subnets
 2015-02-20 11:19:27 -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
Jayesh Kariya
014ce111ab adding win_autoruns unit test case 2015-02-20 19:16:09 +05:30
Gabriel Fornaeus
320ba04b22 Moved ipcidr-doc to ipcidr() instead of compound() 2015-02-20 10:40:13 +01: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
Thomas S Hatch
a0440c61d0 Merge pull request #20837 from viktorkrivak/develop 
Fix multi comps and multi dist bugs
 2015-02-19 13:20:52 -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
Mathieu Drapeau
4bf1d6838a Adding current module directory to the sys.path in order to 
avoid dependencies import errors for other modules at the same
level. (https://github.com/saltstack/salt/issues/16556)
 2015-02-19 14:20:15 -05:00
Thomas S Hatch
97cda220fa Add requisite ins to state internal kwargs 2015-02-19 12:13:37 -07:00