Commit Graph

57035 Commits

Author SHA1 Message Date
Jacob Hammons
7019fa4042 updated versionadded
Refs #24813
2015-07-29 15:11:39 -06:00
Thomas S Hatch
f06dd05a31 Merge pull request #25505 from 0xf10e/glance_state_module_boron
Glance state module for 2015.8 "Beryllium"
2015-07-29 14:55:56 -06:00
Justin Findlay
b6cfd54f3b add note to winrepo state docs about required grain
Fixes #25801.
2015-07-29 14:20:52 -06:00
Colton Myers
2d12fc46c9 Merge pull request #25843 from jtand/parser_lint
Fixed a lint error in parsers.py
2015-07-29 13:49:41 -06:00
Colton Myers
2510b8be9c Merge pull request #25835 from techhat/spmupdaterepo
spm update_repo doesn't always require arguments
2015-07-29 13:48:24 -06:00
justinta89
47f5aa203a Fixed a lint error in parsers.py 2015-07-29 13:35:51 -06:00
Robert Davis
fb43e4e21a Fixing problem with variable assignment being too late. 2015-07-29 11:53:37 -07:00
Robert Davis
eb69b96304 Fixing PEP-8/Lint. 2015-07-29 11:52:12 -07:00
Yash
83a1240fce Lint fix #1 2015-07-29 11:09:17 -07:00
Thomas S Hatch
2c3a97fde6 Merge pull request #25837 from jacobhammons/man-page-updates
regenerated man pages
2015-07-29 11:39:40 -06:00
Thomas S Hatch
d6a26a054a Merge pull request #25830 from sjorge/smartos-libcrypto-fix
Loading of libcrypto on smartos esky fixed
2015-07-29 11:39:12 -06:00
Florian Ermisch
e87f35d3cc return error when finding multiple images in glance.image_update 2015-07-29 19:33:02 +02:00
Robert Davis
0e7c801ef1 Fixing bad assumption in app.py to fix failing tests. 2015-07-29 10:04:34 -07:00
Florian Ermisch
f050db5976 add default for 'visibility', should fix #25814 2015-07-29 18:57:02 +02:00
Thomas Jackson
9ab57fdb33 Switch to WeakKeyDictionary to support python 2.6 2015-07-29 09:56:27 -07:00
Jacob Hammons
0e02191f61 regenerated man pages 2015-07-29 10:24:47 -06:00
Thomas S Hatch
d9ab4bb989 Merge pull request #25833 from jahamn/fix-cp.push-not-recreating-empty-files
Allows cp.push to recreate empty files
2015-07-29 10:14:48 -06:00
Florian Ermisch
2991e4028e restore the image_create interface from 2015.5.3
Added some warn_until('Boron', ...) so we can remove
the old parameters after the next but one release.
2015-07-29 18:12:48 +02:00
Mike Place
f6f096e3e5 Merge pull request #25829 from peterdemin/develop
Fixed typo in salt.states.saltmod.function doc string
2015-07-29 10:06:36 -06:00
Thomas Jackson
fb4cdc475f Keep track of SyncWrapper's IOLoop usage
While thinking through issues that might cause #25718 I ran into this case-- where you can create 2 sync wrappers with the same parent IOLoop and run into problems because you can't start/stop the loop multiple times like that and have the call tree work correctly. To solve this (since it *should* be the exceptional case) I'm making SyncWrapper keep track of which loops are in use-- then if someone attempts this situation it will simply make another one.
2015-07-29 08:48:33 -07:00
Joseph Hall
4fae8527e2 Need a comma 2015-07-29 09:48:03 -06:00
Mike Place
b4cbd67231 Merge pull request #25834 from cachedout/lint_25804
Lint #25804
2015-07-29 09:44:39 -06:00
Joseph Hall
733b842a6c spm update_repo doesn't always require arguments 2015-07-29 09:44:29 -06:00
Mike Place
069802d8ae Lint #25804
Refs #25804
2015-07-29 09:44:13 -06:00
Mike Place
bb66b4a9c1 Merge pull request #25804 from lyft/github_salt_module
GitHub salt module
2015-07-29 09:43:19 -06:00
Mike Place
3849790698 Merge pull request #25832 from DSRCompany/event_subscribe_fix
Event subscribe fix
2015-07-29 09:41:14 -06:00
Thomas S Hatch
6f93d64784 Merge pull request #25831 from rallytime/fix-11474
Add salt:// to key_url options to docs for pkgrepo.managed
2015-07-29 09:38:43 -06:00
Thomas S Hatch
25ba902e08 Merge pull request #25747 from rallytime/one-vms
Added remaining VM functions to the OpenNebula driver
2015-07-29 09:33:57 -06:00
Thomas S Hatch
53638a5f5b Merge pull request #25766 from lyft/splunk_salt_module
Splunk salt module
2015-07-29 09:33:22 -06:00
Thomas S Hatch
9964e2a8c2 Merge pull request #25768 from rallytime/one-improvements
Made some list_* functions public and removed unnecessary functions in OpenNebula
2015-07-29 09:32:48 -06:00
Thomas S Hatch
5cf19b1981 Merge pull request #25794 from s0undt3ch/features/raas-5-salt-ssh
Enforce a minimum of python 2.6 on thin creation
2015-07-29 09:30:24 -06:00
Thomas S Hatch
72b3633383 Merge pull request #25807 from rallytime/fix-22699
Provide helpful error when using actions with a mapfile
2015-07-29 09:30:15 -06:00
Thomas S Hatch
db7cf2d4e6 Merge pull request #25808 from jfindlay/doc_conf
add highstate opts to config/__init__.py, update docs
2015-07-29 09:30:04 -06:00
Thomas S Hatch
366f25c89c Merge pull request #25812 from jfindlay/terse_warn
add highstate warnings to terse output
2015-07-29 09:29:44 -06:00
Thomas S Hatch
71497adc0d Merge pull request #25818 from jfindlay/autoruns_users
fix autoruns list
2015-07-29 09:29:20 -06:00
Thomas S Hatch
5396d81029 Merge pull request #25823 from g0dlike/develop
adding vm_name to ip resolving and using ip for vm creation
2015-07-29 09:29:09 -06:00
Thomas S Hatch
0216277dbb Merge pull request #25824 from klyr/fix_get_managed
Fix get_managed() in file.py module for local files
2015-07-29 09:28:54 -06:00
Jason Hamner
eac19fbf33 Allows cp.push to recreate empty files
Fixes #23288
cp.push and cp.push_dir now can recreate empty files
2015-07-29 09:16:45 -06:00
Thomas S Hatch
98b324c5f8 Merge pull request #25826 from alprs/fix-onchanges_type_check
Check that "onchanges" is a list
2015-07-29 09:00:28 -06:00
Dmitry Kuzmenko
df35299a35 Update RaetEvent to conform to the SaltEvent interface. 2015-07-29 17:44:02 +03:00
Dmitry Kuzmenko
bf9dd00aac Subscribe event to bus is optional now
Once subscribed to publisher SUB socket gets collecting all incoming
messages that is unwanted behavior for fire-only events.
Fixed by using listen=<True|False> constructor argument.
2015-07-29 17:44:02 +03:00
rallytime
067ea788e9 Add salt:// to key_url options to docs for pkgrepo.managed
Fixes #11474
2015-07-29 08:38:37 -06:00
Justin Findlay
a7c3dc520b Merge pull request #25820 from sjorge/smartos-libcrypto-prereq
Prerequisite to fix the smartos libcrypto loading
2015-07-29 08:26:22 -06:00
Florian Ermisch
fa0b78435f correct release names 2015-07-29 16:03:19 +02:00
Petr Demin
404f22f09f Fixed typo in salt.states.saltmod.function doc string 2015-07-29 16:48:44 +03:00
Jorge Schrauwen
9b8091e8d4 fix also needed for esky package inside a zone 2015-07-29 12:36:07 +00:00
Florian Ermisch
f555b0944a fix imports 2015-07-29 14:26:41 +02:00
Florian Ermisch
9714a63fd2 add warn_until('Carbon',...) where code will be obsolete 2015-07-29 14:23:10 +02:00
Florian Ermisch
84953c674e Change behavior in Carbon, but no RuntimeError until Nitrogen 2015-07-29 13:55:50 +02:00
Florian Ermisch
1665785e3e PEP8 E261/PEP8 E302/PEP8 E502/E1305
You see, I don't have salt-pylint working yet...
2015-07-29 13:24:01 +02:00