valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,136 Commits 24 Branches 182 Tags 341 MiB
bb7c60fff8
Commit Graph

35136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
7oku
bb7c60fff8 removed doubled "provider: azure" statement 
needed once only
 2014-08-08 14:55:19 +02:00
Joseph Hall
8149bab1d9 Merge pull request #14847 from sbellem/docs 
Fixed typo
 2014-08-08 04:22:37 -06:00
Sylvain Bellemare
8d3dbabb4a Fixed typo 2014-08-08 12:16:47 +02:00
Colton Myers
67089c074b Merge pull request #14838 from techhat/vsphere 
Clarify docstring for URL in vsphere
 2014-08-07 16:36:28 -06:00
Joseph Hall
1a8b9a72ed Clarify docstring for URL in vsphere 2014-08-07 16:31:17 -06:00
Joseph Hall
5031a1bd42 Merge pull request #14837 from techhat/vsphere 
Add more URL clarifications
 2014-08-07 16:27:24 -06:00
Joseph Hall
a6476e0361 Add more URL clarifications 2014-08-07 16:25:14 -06:00
Thomas S Hatch
6a18a62788 Merge pull request #14834 from gtmanfred/develop 
Only assign win_password if it actually is set
 2014-08-07 15:53:08 -06:00
Jeff Schroeder
b0467e2265 Add version added for pillar_source_merging_strategy 
Some of my coworkers tried to use this feature and realized it isn't available. git tag --contains for the commit which adds it shows:

    $ git tag --contains 3b9891b1
    v2014.7
 2014-08-07 15:30:24 -05:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	doc/topics/development/conventions/formulas.rst
 2014-08-07 15:51:49 -04:00
Colton Myers
989158badc Merge pull request #14830 from UtahDave/2014.7new 
Don't try to get a hash of a directory
 2014-08-07 13:16:00 -06:00
Daniel Wallace
25c012856b only overwrite password if win_password is set 
for rackspace.py
 2014-08-07 15:03:06 -04:00
Daniel Wallace
267704cd45 Only assign win_password if it actually is set 2014-08-07 14:57:43 -04:00
Thomas S Hatch
e3f96963a2 Merge pull request #14827 from nmadhok/patch-1 
Update README.rst
 2014-08-07 12:33:00 -06:00
Thomas S Hatch
f76596f403 Merge pull request #14819 from steverweber/fix_more_tries 
auth_tries should be repeated
 2014-08-07 12:27:05 -06:00
Thomas S Hatch
ebe3d43f24 Merge pull request #14798 from whiteinge/npm-list-ignore-warnings 
Use the silent option when listing npm packages
 2014-08-07 12:24:43 -06:00
Thomas S Hatch
e17ca37530 Merge pull request #14796 from whiteinge/salt-event-fire_master_env 
Added function to fire event using env vars for event data
 2014-08-07 12:24:31 -06:00
Thomas S Hatch
d6ccef59e1 Merge pull request #14794 from nmadhok/format-bash-code-block 
Formatting salt.modules.yumpkg.owner CLI Example to bash code block instead of plain text
 2014-08-07 12:24:01 -06:00
Thomas S Hatch
5b0b410d0f Merge pull request #14790 from whiteinge/doc-formulas-update 
Misc cleanups, clarifications, and additions to the formulas conventions doc
 2014-08-07 12:23:37 -06:00
Thomas S Hatch
a79e369011 Merge pull request #14781 from tserong/patch-1 
Disable service.py for entire SUSE family >= 12
 2014-08-07 12:22:55 -06:00
Thomas S Hatch
0e87a59e8d Merge pull request #14772 from lyft/boto_secgroup-states-support-vpc 
provide support for VPC security groups in boto_secgroup state module
 2014-08-07 12:22:04 -06:00
Thomas S Hatch
eddc5b5519 Merge pull request #14760 from cachedout/14334 
Sketch of list support for key accept/delete
 2014-08-07 12:16:11 -06:00
Thomas S Hatch
f2b6d90d27 Merge pull request #14831 from thatch45/doc_clarify 
Add clarity note in the docs
 2014-08-07 12:09:07 -06:00
Thomas S Hatch
996bae04cd Add clarity note in the docs 2014-08-07 12:08:14 -06:00
Erik Johnson
ec43a24d67 Merge pull request #14822 from whiteinge/salt-npm-pkgs 
Added pkgs support to the npm module/state
 2014-08-07 12:50:30 -05:00
David Boucha
6b0c5f2e01 Don't try to get a hash of a directory 2014-08-07 11:50:00 -06:00
Thomas S Hatch
41c5d7f80b Merge pull request #14828 from thatch45/2014.7 
lint fix
 2014-08-07 11:45:28 -06:00
Thomas S Hatch
b468b7bd33 lint fix 2014-08-07 11:44:52 -06:00
Thomas S Hatch
8b5a3c9eca Merge pull request #14807 from thatch45/2014.7 
Properly catch the crypt import @gtmanfred
 2014-08-07 11:44:38 -06:00
Nitin Madhok
4eb80e3bc6 Update README.rst 
Changing format of links
 2014-08-07 13:19:40 -04:00
Colton Myers
ce06161326 Merge pull request #14810 from terminalmage/issue14789 
Move --plugins to within _repoquery()
 2014-08-07 11:18:21 -06:00
Mike Place
c159f16644 Merge pull request #14826 from nmadhok/patch-2 
Update README.rst
 2014-08-07 11:11:47 -06:00
Nitin Madhok
726b7208ec Update README.rst 
Adding link to Salt Development Index Page
 2014-08-07 13:11:17 -04:00
Colton Myers
aa78ebbc32 Merge branch '2014.7' into develop 2014-08-07 11:07:21 -06:00
Colton Myers
eed5339bea Merge pull request #14818 from s0undt3ch/hotfix/manage.version 
Reduce conversions and parsing
 2014-08-07 11:07:01 -06:00
Mike Place
143f65570a Merge pull request #14824 from nmadhok/patch-1 
Update AUTHORS
 2014-08-07 11:03:51 -06:00
Nitin Madhok
5ebed32ede Update AUTHORS 
Adding Nitin Madhok
 2014-08-07 13:00:25 -04:00
Seth House
ed4bb5119e Added pkgs support to the npm module/state 2014-08-07 12:36:39 -04:00
Erik Johnson
fef4c52bc0 Add plugins to group_info() repoquery calls 
The calls here do not use the _repoquery() helper function and need to
have --plugins added to them.
 2014-08-07 10:47:33 -05:00
steve
95862351d0 auth_tries should be repeated 2014-08-07 09:43:06 -04:00
Pedro Algarvio
3cf66d4a80 Reduce conversions and parsing 2014-08-07 14:18:04 +01:00
Thomas S Hatch
166181f3ee Merge branch 'seegno-enhancement/file-source-hash-doc' into develop 2014-08-06 21:16:20 -06:00
Thomas S Hatch
b1953c042b clarify source hash files and the source hash raw data 2014-08-06 21:13:48 -06:00
Thomas S Hatch
5fdb7ef8ab Merge branch 'enhancement/file-source-hash-doc' of https://github.com/seegno/salt into seegno-enhancement/file-source-hash-doc 2014-08-06 21:04:23 -06:00
Thomas S Hatch
de3a1ce283 Merge pull request #14690 from jacksontj/multi_syndic 
Multi syndic
 2014-08-06 20:53:39 -06:00
Erik Johnson
80cd5f78b0 Move --plugins to within _repoquery() 
This ensures that all repoquery commands use --plugins. Fixes #14789.
 2014-08-06 19:03:04 -05:00
Pedro Algarvio
5b1c09ae82 Merge branch 'develop' of github.com:saltstack/salt into develop 2014-08-07 00:12:06 +01:00
Pedro Algarvio
4f7a6919d9 Merge branch '2014.7' into develop 2014-08-07 00:11:45 +01:00
Colton Myers
ca30b7783c Merge pull request #14805 from basepi/manageversions14788 
Fix manage.versions version comparison
 2014-08-06 17:07:51 -06:00
Thomas S Hatch
58e415df02 Properly catch the crypt import @gtmanfred 2014-08-06 16:14:50 -06:00