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
72,031 Commits 24 Branches 182 Tags 341 MiB
4587a3112f
Commit Graph

72031 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4587a3112f Merge pull request #35035 from plastikos/test-cli_exit_status 
Test CLI exit status
 2016-08-01 16:24:55 -06:00
Mike Place
efdc941058 Merge pull request #35091 from calve/patch-1 
Fix salt.utils.boto assign_funcs documentation
 2016-08-01 16:13:26 -06:00
Mike Place
ab4be69829 Merge pull request #35109 from thatch45/typos 
Branding, it matters
 2016-08-01 16:07:10 -06:00
Thomas S Hatch
307d5a17b2 Branding, it matters 2016-08-01 16:01:14 -06:00
Thomas S Hatch
9c1bb5c3ff Merge pull request #35062 from thatch45/develop 
Initial Docker sls tutorial
 2016-08-01 15:57:39 -06:00
Thomas S Hatch
d3a5e13ef3 like this you think? 2016-08-01 15:55:46 -06:00
Nicole Thomas
485dd07fe9 Merge pull request #35108 from dmacvicar/docker_base_image 
this was supposed to be only temporary
 2016-08-01 15:53:33 -06:00
Nicole Thomas
0b5a8370d5 Merge pull request #35106 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-01 15:51:26 -06:00
Thomas S Hatch
c7ea94ea01 it is no secret, I don't spell too well :) 2016-08-01 15:06:40 -06:00
Thomas S Hatch
64d6282135 SUSE, not Suse, not SuSE 2016-08-01 15:00:37 -06:00
Thomas S Hatch
b37e81a6cf clarify on image used 2016-08-01 14:44:32 -06:00
Duncan Mac-Vicar P
680dacafd3 this was supposed to be only temporary 2016-08-01 22:24:41 +02:00
Thomas S Hatch
823dc8d586 fix typo 2016-08-01 14:23:07 -06:00
rallytime
a2fbbebe86 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/master.py
  - salt/modules/saltutil.py
  - salt/states/saltmod.py
 2016-08-01 13:42:36 -06:00
Nicole Thomas
94a983f129 Merge pull request #35104 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-01 12:56:42 -06:00
Mike Place
5c65b77b1a Merge pull request #34870 from jerrykan/cloud_sock_dir 
Pass 'sock_dir' for all 'salt.utils.cloud.fire_event()' calls (#34806)
 2016-08-01 11:44:00 -06:00
Mike Place
784000494d Merge pull request #34947 from benhosmer/34587--postgres-initdb 
34587  postgres initdb
 2016-08-01 11:38:14 -06:00
Mike Place
8fc2c672eb Merge pull request #35034 from thor/feature/tomcat-version-care 
Fixing the Tomcat state's indifference to a lack of versions and incorrect file paths
 2016-08-01 11:36:48 -06:00
Mike Place
cba2352ee5 Merge pull request #35100 from bodhi-space/infra1881 
INfRA-1881 - add 'filters' option to boto_ec2.find_instances, etc.
 2016-08-01 11:34:38 -06:00
Mike Place
6c056a829e Merge pull request #35105 from rallytime/update-2016.3.0-release-notes 
Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability
 2016-08-01 11:26:54 -06:00
Mike Place
98aad37cd6 Merge pull request #35095 from eradman/localemod 
Properly mock localemod unit tests
 2016-08-01 11:26:21 -06:00
Thayne Harbaugh
c6d08bf31b Minor tweaks to testing exit codes 
* shared config settings go in `config_base` rather than *each* config
* Ensure that `name` attribute is a string
* Ensure that `dirtree` gets used from kwargs
* Adding 'XXXX' to the mkdtemp template is unnecessary
* Only template values if they are strings - otherwise just use them directly
 2016-08-01 11:20:15 -06:00
Mike Place
ea85370bd2 Merge pull request #35092 from calve/develop 
Fix salt.states.boto_secgroup message printing
 2016-08-01 11:17:55 -06:00
Mike Place
4a37708fc0 Merge pull request #35098 from jmacfar/winsm_space 
Missing trailing whitespace after cmd
 2016-08-01 11:16:12 -06:00
rallytime
fbaff3e98e Update 2016.3.0 release notes with repo.saltstack.com Xenial pkg availability 
Refs #33870
 2016-08-01 11:14:53 -06:00
Mike Place
99f82040f3 Merge pull request #35040 from rallytime/py3-ssh-module-decode 
Py3: Use b64decode instead of decode on str objects
 2016-08-01 11:13:18 -06:00
Mike Place
3c58b0237d Merge pull request #35049 from terminalmage/zd868 
Fire events for orchestration jobs containing the passed arguments
 2016-08-01 11:07:04 -06:00
rallytime
dda2c32325 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/saltutil.py
  - salt/returners/postgres_local_cache.py
 2016-08-01 11:06:43 -06:00
Tom Williams
f2f1eee722 INfRA-1881 - add 'filters' option to boto_ec2.find_instances, etc. 2016-08-01 12:41:02 -04:00
Mike Place
848bf0272f Merge pull request #35050 from terminalmage/fix-saltdev-arg 
[orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument
 2016-08-01 09:48:08 -06:00
rallytime
a1523a3327 Add pylint disable for Python 3 specific kwarg 2016-08-01 09:35:08 -06:00
Eric Radman
80f8b87ce3 Properly mock localemod unit tests 
locale_gentoo* unit tests only pass on Linux systems because the
localedef is in the search path.
 2016-08-01 11:26:13 -04:00
Mike Place
1f8a0fd1e7 Merge pull request #35059 from vutny/event-function-args 
Add `fun_args` field to events generated by execution of Master modules
 2016-08-01 07:01:42 -06:00
calve
d431487aa4 Fix message printing 2016-08-01 14:56:20 +02:00
Mike Place
d137c4b986 Merge pull request #34955 from lubyou/fix-dism-on-non-english-systems 
force dism to always output english text
 2016-08-01 06:54:03 -06:00
Mike Place
9bf9edb0e0 Merge pull request #35071 from terminalmage/issue35065 
Detect nodegroup lists with no compound syntax as L@host1,host2,host3...
 2016-08-01 06:52:40 -06:00
Mike Place
ef2c89f0d8 Merge pull request #35073 from MTecknology/develop 
Adding zfsroot option to lxc-create.
 2016-08-01 06:44:26 -06:00
Mike Place
7f9a2c6e68 Merge pull request #35075 from dschaller/fix-broken-npm-json-formatting 
Fix broken npm json formatting
 2016-08-01 06:42:06 -06:00
Mike Place
802bc28d3f Merge pull request #35082 from AlexNPavel/develop 
Add encryption support to etcd
 2016-08-01 06:38:05 -06:00
calve
7bda2718b8 Fix salt.utils.boto assign_funcs documentation 
I belive this was a misleading typo as `apply_funcs` does not exists in this module.
 2016-08-01 14:36:15 +02:00
Mike Place
e14407b8ee Merge pull request #35076 from dmacvicar/add_suse_links_1 
add links to (open)SUSE family of images and build generation tools
 2016-08-01 06:28:18 -06:00
Mike Place
8b88e09467 Merge pull request #35077 from jf/tighten-test_list_modules_with_arg 
Tighten up test_list_modules_with_arg: should include "assertNotIn" too
 2016-08-01 06:27:46 -06:00
Mike Place
ff7ddf0b68 Merge pull request #35078 from jacobweinstock/fix-missing-non-keyword-argument 
added missing non-keyword argument skip_verify to __get_artifact func…
 2016-08-01 06:22:47 -06:00
Mike Place
38bee69fc8 Merge pull request #35089 from calve/develop 
Output changes to be applied on security group when test=True
 2016-08-01 05:53:34 -06:00
calve
90868f45bd Output changes to be applied on security group when test=True 2016-08-01 11:22:55 +02:00
Ben Hosmer
9f8f34d9bc Fix pylint errors 2016-07-31 17:02:47 -04:00
Ben Hosmer
b10a2b5285 Fix posixpath unit test error. 2016-07-31 15:39:31 -04:00
Ben Hosmer
9cb3a537a6 Update implement generic bin finder instead of multiple functions 2016-07-31 08:30:24 -04:00
Duncan Mac-Vicar P
9bfb3d85f1 add links to (open)SUSE family of images and build generation tools 2016-07-31 10:37:18 +02:00
John Kristensen
149ef135f4 Warn users when calling salt.utils.cloud.fire_event() without sock_dir 
The `sock_dir` parameter should be used when calling `fire_event()`
because it currently defaults to a value that isn't very useful if no
value is passed in. Eventually the default value will be removed, at
which point the `sock_dir` parameter will become a hard requirement. In
the meantime we use `salt.utils.warn_until()` to warn the users of this
impending change.
 2016-07-31 17:04:43 +10:00