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,246 Commits 24 Branches 182 Tags 341 MiB
13f5f7bb3e
Commit Graph

59246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Colton Myers
9ddc88c6ba Merge pull request #27198 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-17 15:33:15 -06:00
Justin Findlay
8b2cb330e3 Merge pull request #27203 from whiteinge/sphinx-apidoc-wrapper 
Add script to run sphinx-apidoc against our module directories
 2015-09-17 15:23:20 -06:00
rallytime
cced6e9031 Don't repeat GCE setup instructions, and make the use of .json files clearer 2015-09-17 15:07:49 -06:00
Colton Myers
1cbfa06591 Remove heavily-mocked failing test 2015-09-17 14:38:05 -06:00
rallytime
ebf91c330c Small code clean up 2015-09-17 14:23:30 -06:00
Seth House
fed627763b Add script to run sphinx-apidoc against our module directories 
The script itself is pretty inflexible so we're doing a little find &
sed trickery around it.
 2015-09-17 14:22:12 -06:00
Colton Myers
8c204a45ab Merge pull request #27197 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-17 13:53:22 -06:00
Colton Myers
7f391a409c Fix lint 2015-09-17 13:52:24 -06:00
Mike Place
6747400e1c Merge pull request #27174 from tinyclues/26505_saltnado_improve_accept_support 
Improve support of Accept header in saltnado.
 2015-09-17 12:04:25 -06:00
Mike Place
430c48c5ea Merge pull request #27195 from jacobhammons/doc-build 
Fixed sphinx / latex build warnings and errors
 2015-09-17 11:28:37 -06:00
Mike Place
3717330d04 Merge pull request #27192 from DSRCompany/issues/26885_salt_call_zmq_monitor_fix 
Correclty install zeromq ioloop.
 2015-09-17 11:26:18 -06:00
Mike Place
8f8e75c5ff Merge pull request #27182 from Awingu/2015.8 
fix restart_on_error
 2015-09-17 11:24:01 -06:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
rallytime
6b2a00e947 Avoid RunTimeError (dictionary changed size during iteration) with keys() 
Fixes #24573
 2015-09-17 11:08:08 -06:00
Colton Myers
2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/gce.rst
    salt/cli/api.py
    salt/cli/call.py
    salt/cli/cp.py
    salt/cli/key.py
    salt/cli/run.py
    salt/cli/salt.py
    salt/modules/dockerio.py
    salt/states/dockerio.py
 2015-09-17 10:54:33 -06:00
Jacob Hammons
fad87e34a2 Fixed lint errors 2015-09-17 10:27:54 -06:00
Justin Findlay
e956d88f5f Merge pull request #27194 from rallytime/bp-27180 
Back-port #27180 to 2015.5
 2015-09-17 10:17:24 -06:00
Mike Place
97d2a5fddc Merge pull request #27163 from terminalmage/issue27093 
Workaround upstream tornado bug affecting redirects
 2015-09-17 10:09:01 -06:00
Jacob Hammons
e56f02b025 re-add cheatsheet do-over 2015-09-17 09:32:52 -06:00
Jacob Hammons
60a8330561 re-added cheatsheet.tex 2015-09-17 09:29:09 -06:00
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00