valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,268 Commits 24 Branches 182 Tags 341 MiB
3e30daba25
Commit Graph

59268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
3e30daba25 Merge pull request #27298 from DSRCompany/feature/23157_module_executor 
Don't modify return results in splay.
 2015-09-22 10:27:53 -06:00
Dmitry Kuzmenko
d01bfed117 Don't modify return results in splay. 
Splay originally was converting return to dict and adding 'splay' key to
the return result. That breaks salt scripts.
 2015-09-22 18:02:44 +03:00
Justin Findlay
0dd68f73eb Merge pull request #27291 from khrisrichardson/remove-dup-cmd_ret 
Fixes https://github.com/saltstack/salt/pull/26355/files#r37261911
 2015-09-21 21:25:47 -06:00
Khris Richardson
b20680d3f6 fixes https://github.com/saltstack/salt/pull/26355/files#r37261911 2015-09-21 16:58:29 -07:00
Justin Findlay
c839bb960b Merge pull request #27258 from llua/zsh-completion 
Zsh completion improvements
 2015-09-21 16:39:20 -06:00
Justin Findlay
1c551c6ad6 Merge pull request #27287 from rhealitycheck/mongo-returners-patch-1 
Mongo returners patch 1
 2015-09-21 16:35:55 -06:00
rhealitycheck
8e698dfb07 Update mongo_return.py 
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
 2015-09-21 15:19:18 -05:00
rhealitycheck
2eb4744ccc Update mongo_future_return.py 
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
 2015-09-21 15:18:05 -05:00
Justin Findlay
9061cccc4a Merge pull request #27280 from snarfmonkey/develop 
minion log_level default is 'info' not 'warning'
 2015-09-21 13:27:32 -06:00
Nicole Thomas
2989247913 Merge pull request #27272 from techhat/ec2name 
Make sure list_nodes_full contains a name attribute
 2015-09-21 09:16:45 -06:00
Joseph Hall
fcd467d01b Make sure list_nodes_full contains a name attribute 2015-09-21 08:21:52 -06:00
Justin Findlay
611d3e5760 Merge pull request #27256 from julianbrost/fix-statvfs-error-handling 
Fix error handling in salt.modules.file.statvfs
 2015-09-19 19:38:08 -06:00
Eric Cook
2bee0fd3d0 zsh-completion: add completion for salt-key 2015-09-19 18:35:39 -04:00
Eric Cook
6f4f971ea7 zsh-completion: add completion for salt-run 2015-09-19 18:32:23 -04:00
Eric Cook
973a2b46fd zsh-completion: remove -d, --doc, argument expectation 
and small formatting changes.
 2015-09-19 18:25:39 -04:00
Julian Brost
0312326e5e Fix error handling in salt.modules.file.statvfs 
The old error messaged printed the wrong variable and was also
misleading as statvfs does not create any files.
 2015-09-19 18:24:00 +02:00
Mike Place
115c1ed8ec Merge pull request #27211 from whiteinge/local_batch-client 
Add local_subset client
 2015-09-18 15:42:00 -06:00
Mike Place
9c174e9fc2 Merge pull request #27246 from garethgreenaway/develop_ec2_create_snapshot_exception 
Develop - cloud.ec2.create_snapshot exception
 2015-09-18 15:41:29 -06:00
Aaron S.
13f5f7bb3e default log_level is info, not warning 
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
 2015-09-18 13:59:45 -07:00
Aaron S.
3d866f773d log_level default is info 
see https://github.com/saltstack/salt/blob/develop/salt/config/__init__.py#L855
 2015-09-18 13:59:01 -07:00
Justin Findlay
c9255f2bbd Merge pull request #27236 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-18 13:55:49 -06:00
Justin Findlay
77a1e7b7b6 Merge pull request #27235 from isbm/isbm-pkg.info-tz-bugfix 
Timezone fix for the `pkg.info`
 2015-09-18 13:52:44 -06:00
Gareth J. Greenaway
4955bfd063 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID 2015-09-18 12:44:13 -07:00
Justin Findlay
28155ef63a Merge pull request #27218 from eyj/fix-27217 
fixes #27217 clear_old_remotes clears wrong directory (gitfs)
 2015-09-18 13:43:49 -06:00
Justin Findlay
1054928234 Merge pull request #27213 from macgyver13/patch-1 
Make get_event compatible with salt/client
 2015-09-18 13:38:15 -06:00
Mike Place
a11806e049 Merge pull request #27230 from benhosmer/develop 
Fix typo in AWS doc config
 2015-09-18 12:22:34 -06:00
Bo Maryniuk
8fb2940a2d Return install date only if possible. 2015-09-18 19:26:22 +02:00
Colton Myers
9864d9e0fa Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/index.rst
    doc/topics/releases/boron.rst
    salt/cli/daemons.py
    salt/cli/salt.py
    salt/modules/jboss7.py
    salt/states/file.py
 2015-09-18 11:03:37 -06:00
Bo Maryniuk
159fce9f31 Return RPM package time in UTC timezone 2015-09-18 18:55:57 +02:00
Bo Maryniuk
f3fa7bc405 Remove time fraction and return ISO in UTC 2015-09-18 18:55:04 +02:00
Colton Myers
253ac5e0c3 Merge pull request #27232 from basepi/release.notes.stubs 
[2015.8] Add stub release notes for 2015.8.1
 2015-09-18 10:53:01 -06:00
Colton Myers
25410706ee Add stub release notes for 2015.8.1 2015-09-18 10:51:54 -06:00
Ben Hosmer
5393751332 Fix typo in AWS doc config 2015-09-18 12:21:37 -04:00
Mike Place
c542cd49d0 Merge pull request #27199 from rallytime/fix-24573 
Avoid RunTimeError (dictionary changed size during iteration) with keys()
 2015-09-18 09:44:27 -06:00
Mike Place
ee0824987e Merge pull request #27204 from rallytime/cloud-cleanup 
Small cloud clean up
 2015-09-18 09:43:52 -06:00
Mike Place
e7a929b4e8 Merge pull request #27221 from eyj/enh-create_image 
Create AMI from instance and query AMIs
 2015-09-18 09:42:51 -06:00
Joseph Hall
6b79ad69a9 Merge pull request #27206 from rallytime/gce-doc-cleanup 
Don't repeat GCE setup instructions, and make the use of .json files clearer
 2015-09-18 08:38:39 -06:00
Joseph Hall
1d022eb5de Merge pull request #27210 from rallytime/do-clean-up 
Refactor some digital ocean functions
 2015-09-18 08:38:01 -06:00
Nasenbaer
983609984c Renamed param name to ami_name to be consistent with aws 2015-09-18 16:26:35 +02:00
Nasenbaer
da64431f8e Added find_images function to search for AMIs 2015-09-18 15:06:01 +02:00
Nasenbaer
5a7ffcd66b Rename name parameter to make a distinction between ami and instance name 2015-09-18 13:22:53 +02:00
Nasenbaer
b2a5506447 Create_image function to create an AMI from existing instances 2015-09-18 13:22:53 +02:00
Bo Maryniuk
dba47ecaed Return UTC timestamp for modification of path. 2015-09-18 11:50:34 +02:00
Nasenbaer
cccdeee18a fixes #27217 clear_old_remotes clears wrong directory (gitfs) 2015-09-18 09:57:32 +02:00
macgyver13
5b906b31d7 Make get_event compatible with salt/client 2015-09-17 21:00:35 -04:00
Seth House
6be5745f61 Add local_subset client to docs 2015-09-17 18:03:04 -06:00
Seth House
35b2c5df0d Remove old versionadded from local_batch client 2015-09-17 18:03:04 -06:00
Seth House
576733fa59 Add new netapi client that wraps LocalClient.cmd_subset 2015-09-17 18:03:04 -06:00
rallytime
808a5b3b81 Make sure we set the full data to the ret variable 2015-09-17 17:54:09 -06:00
rallytime
9b635004e2 Refactor some digital_ocean functions to help simplify the driver 2015-09-17 17:36:28 -06:00