Commit Graph

57064 Commits

Author SHA1 Message Date
Jacob Hammons
3f3db4bd8e Additions for #24042 2015-07-30 15:43:21 -06:00
Mike Place
c011511b1c Merge pull request #25896 from cachedout/lint_25876
Lint
2015-07-30 15:39:50 -06:00
Mike Place
1dc128b2f2 Lint 2015-07-30 15:39:34 -06:00
Mike Place
1b3ea19a9e Merge pull request #25876 from jacksontj/2015.8
Fixes for 2015.8
2015-07-30 15:38:12 -06:00
Colton Myers
93a182d9ea Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    doc/man/salt.7
    salt/minion.py
    salt/modules/file.py
    salt/returners/carbon_return.py
2015-07-30 15:31:10 -06:00
rallytime
6ef7979a72 Allow the use of datastore_name instead of datastore_id 2015-07-30 14:59:23 -06:00
Jacob Hammons
db2129b199 Minor doc bug fixes
Refs #24042
Refs #25650
Refs #21296
Refs #23788
2015-07-30 14:39:15 -06:00
Nicole Thomas
a0ab784216 Merge pull request #25815 from lyft/mongolab_telemetry_salt_module
Mongolab telemetry salt module
2015-07-30 14:23:22 -06:00
Justin Findlay
af2326af68 Merge pull request #25885 from t0rrant/patch-3
Update Debian changelog
2015-07-30 14:05:59 -06:00
Justin Findlay
85ddba5ee8 Merge pull request #25872 from dmurphy18/dgm_debbuilder
Fixes for pkgbuild, added support for dependencies building package
2015-07-30 13:56:42 -06:00
TheBigBear
97b6269df3 Update 7-zip msi un-installer instructions
The instructions as-are do not actually work. The uninstaller flag takes the windows GUID of the msi product code. And the various ```install_flags``` and ```uninstall_flags``` do NOT need leading, or trailing spaces.

@twangboy can confirm this is a better example (also see salt issue #25778 https://github.com/saltstack/salt/issues/25778)
2015-07-30 20:33:15 +01:00
rallytime
0211972fd7 Whitespace fix 2015-07-30 13:05:29 -06:00
Akhter Ali
7d68e49d98 Update schedule.py
This is regarding issue #25577

There is technically nothing wrong with the documentation already placed, it's just keeping up with consistency.
2015-07-30 12:53:21 -06:00
Thomas S Hatch
6ce0b3e5b8 Merge pull request #25875 from rallytime/bp-25862
Back-port #25862 to 2015.5
2015-07-30 11:34:02 -06:00
Thomas S Hatch
66dcc5525e Merge pull request #25873 from rallytime/bp-25855
Back-port #25855 to 2015.5
2015-07-30 11:33:54 -06:00
Thomas S Hatch
bf8bd38da7 Merge pull request #25871 from rallytime/bp-25829
Back-port #25829 to 2015.5
2015-07-30 11:33:42 -06:00
Thomas S Hatch
f26310ff0b Merge pull request #25869 from rallytime/bp-25788
Back-port #25788 to 2015.5
2015-07-30 11:33:33 -06:00
Thomas S Hatch
c24970e22a Merge pull request #25867 from rallytime/bp-25370
Back-port #25370 to 2015.8
2015-07-30 11:33:28 -06:00
Manuel Torrinha
3f73900c61 Update Debian changelog 2015-07-30 18:32:42 +01:00
Thomas S Hatch
b934424bda Merge pull request #25851 from seblu/develop
Systemd modules improvment and bug fixes
2015-07-30 11:32:31 -06:00
Yash
0ee5e14f13 Fix warns 2015-07-30 10:17:01 -07:00
Yash
b744ec7367 missed check 2015-07-30 10:10:57 -07:00
jacobhammons
e1ac2a3ebe Merge pull request #25845 from jacobhammons/24813
updated versionadded
2015-07-30 10:50:25 -06:00
Colton Myers
810fbb8bfb Merge pull request #25853 from davidjb/ssh-id-wrapper-non-root
Make ssh-id-wrapper accessible to non-root users
2015-07-30 10:49:47 -06:00
Manuel Torrinha
5dbf1bcfda Add new argument for ignoring installed packages
Adds support for when you want pip to ignore existing packages and reinstalling them.

In example, when you have a specific version of a package defined in the requirements file and you want your state output clean instead of showing error thown by pip (where it asks you to use --upgrade to upgrade existing packages)
2015-07-30 17:38:41 +01:00
Thomas Jackson
088d73dfe7 Streams closing should not count as errors 2015-07-30 09:29:19 -07:00
Thomas Jackson
ffb549e011 Print out debug line with pre-msgpacked message
This way it will have valid characters in the output, so the file won't look binary ;)
2015-07-30 09:26:11 -07:00
Thomas Jackson
f414eb4ee7 Start the minion event publisher before attempting to connect to a master.
With this initializing afterwards all local minion events go nowhere.
2015-07-30 09:26:05 -07:00
Thomas Jackson
fe62ce513f Handle errors sending mine datas to master
Fix for #25720
2015-07-30 09:21:38 -07:00
rallytime
c6715e0404 Protect against passing a map file in addition to VM names with --destroy
Fixes #24036
2015-07-30 10:19:16 -06:00
Yash
833eda1ba6 Update docstrings 2015-07-30 09:07:54 -07:00
Sam Norbury
d7f448d501 Needed popen.wait(). 2015-07-30 09:35:55 -06:00
Sam Norbury
25f8042e41 Checking for scp existance.
Using command -v should be POSIX
2015-07-30 09:35:55 -06:00
Sam Norbury
6b2100a30b New exitcode for SCP not found
Re: https://github.com/saltstack/salt/issues/25478 and https://github.com/saltstack/salt/issues/25026
2015-07-30 09:35:55 -06:00
Thomas S Hatch
6c7bd77dd0 Merge pull request #25862 from zyio/develop
Adding SCP_NOT_FOUND exit code
2015-07-30 09:34:03 -06:00
Thomas S Hatch
b6805b068a Merge pull request #25856 from jfindlay/intro_scale
expand minion reauth scalability documentation
2015-07-30 09:33:17 -06:00
Joseph Hall
745982feed Sanitize sensitive fields in http.query() 2015-07-30 09:31:30 -06:00
puneet kandhari
f1f7ce25b7 Update saltmod.py 2015-07-30 09:28:43 -06:00
puneet kandhari
23a6806008 Update saltmod.py
Docs ftw
2015-07-30 09:28:43 -06:00
Petr Demin
a80c47ee10 Fixed typo in salt.states.saltmod.function doc string 2015-07-30 09:27:14 -06:00
Julien Barbot
1fd4837beb Fix get_managed() in file.py module for local files
This fixes the 'Unable to manage file: string indices must be integers, not str'
error message problem.

source_sum must be a dictionary not a string.
2015-07-30 09:25:33 -06:00
Daniel Hobley
65b18e3b34 Catch a hard crash when running highstate on windows
- Workaround for issue #24002
2015-07-30 09:24:04 -06:00
David Murphy
1c86e0110f Fixes for pkgbuild, added support for dependencies building package 2015-07-30 09:23:00 -06:00
Dmitry Kuzmenko
e0f9a31139 Fixed minion failover to next master on DNS errors. 2015-07-30 09:22:23 -06:00
Dmitry Kuzmenko
c51d8c4f1a Fix: minion doesn't set tok property in masters list case. 2015-07-30 09:19:44 -06:00
Yash
ce4370d7c5 Updating comments 2015-07-30 07:53:07 -07:00
Petr Demin
06a517abb8 #25863 fix - state.pkg: do preflight check only for non-installed packages 2015-07-30 17:49:30 +03:00
Thomas S Hatch
423d528b73 Merge pull request #25840 from jfindlay/winrepo_master
add note to winrepo state docs about required grain
2015-07-30 08:38:27 -06:00
Thomas S Hatch
c5bb5bce0a Merge pull request #25836 from jacksontj/2015.8
Keep track of SyncWrapper's IOLoop usage
2015-07-30 08:37:50 -06:00
Justin Findlay
5b236a2cff Merge pull request #25859 from 0xf10e/fix_glance_warn_until
warn_until(Carbon,...) instead of Boron
2015-07-30 08:15:38 -06:00