valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,049 Commits 24 Branches 182 Tags 341 MiB
26f5482576
Commit Graph

81049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
26f5482576 Merge pull request #40809 from gtmanfred/develop 
Add zookeeper managing module and state
 2017-04-21 12:04:25 -06:00
Mike Place
eacf1b364f Merge pull request #40814 from chqian/dev/chqian/fix_opkg_list_pkgs_with_description 
Make pkg.list_pkgs() parse output with description
 2017-04-21 11:42:49 -06:00
Nicole Thomas
a153f5c204 Merge pull request #40783 from xetus-oss/feature-40755 
Add state.orch_show_sls to the state runner
 2017-04-21 09:45:35 -06:00
Mike Place
8652ad68c8 Merge pull request #40753 from arno01/dockerng-enhanced 
dockerng: avoid network duplication and add driver_opts
 2017-04-21 05:21:33 -06:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts 2017-04-21 08:52:55 +02:00
Daniel Wallace
0b70e9405f add zookeeper module and state 
Also use __context__ in zk_conncurrency
 2017-04-20 17:56:05 -06:00
Nicole Thomas
12345dee7f Merge pull request #40806 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-20 17:05:27 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 13:44:37 -06:00
Nicole Thomas
4914486067 Merge pull request #40802 from rallytime/fix-pkgrepo-test-failure 
Update managed.sls test file: osmajorrelease grain is an int now
 2017-04-20 13:35:01 -06:00
Nicole Thomas
10764b7f2e Merge pull request #40799 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-20 12:43:35 -06:00
Nicole Thomas
665678526d Merge pull request #40798 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 12:42:53 -06:00
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now 
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
 2017-04-20 12:27:45 -06:00
Mike Place
ba2e7dd4f6 Merge pull request #40697 from DSRCorporation/bugs/35691_cache_full_ret 
Keep all return-related values in the job cache.
 2017-04-20 11:57:27 -06:00
Mike Place
c6c3b51a97 Merge pull request #40720 from oeuftete/support-tornado-4.5.0 
Call tornado.httputil.url_concat compatibly
 2017-04-20 11:22:54 -06:00
rallytime
ae6afedd4e Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 11:22:19 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-04-20 11:21:10 -06:00
Mike Place
68542f7aec Merge pull request #40768 from twangboy/fix_win_lgpo 
Fix _build_parent_list function for Py3
 2017-04-20 11:15:39 -06:00
Mike Place
b35c1ff258 Merge pull request #40779 from Enquier/40770_returner_doc_reorder 
Reordering Write Returners documentation
 2017-04-20 11:09:44 -06:00
Mike Place
b5942d1c6a Newlines between funcs 
For lint check
 2017-04-20 10:48:54 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection 
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
 2017-04-20 10:45:13 -06:00
Mike Place
f0f135c71d Merge pull request #40796 from terminalmage/fix-nodegroup-docs 
Fix inaccurate nodegroup docs
 2017-04-20 10:08:21 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs 
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
 2017-04-20 10:07:19 -05:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec 
Pass path to msiexec overloading msiexec parameter
 2017-04-20 12:25:52 +03:00
Terence Kent
f9cd187631 Add support for performing a state.show_sls for the state runner module. This is a very useful feature when writing orchestrate SLS files. 2017-04-19 16:34:06 -07:00
Mike Place
c406d3de0d Merge pull request #40773 from mchugh19/patch-2 
Update msteams.py
 2017-04-19 14:50:14 -06:00
Enquier
b81856e370 Reordering Write Returners documentation 2017-04-19 14:49:28 -06:00
Nicole Thomas
d8f78550d9 Merge pull request #40769 from rallytime/bp-40760 
Back-port #40760 to 2016.11
 2017-04-19 14:23:21 -06:00
Christian McHugh
0f43b2b871 Update msteams.py 
Correct color handling
 2017-04-19 20:10:18 +01:00
Jeffrey 'jf' Lim
71ac15fc4c Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! 2017-04-19 12:04:51 -06:00
Nicole Thomas
99048b1792 Merge pull request #40757 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-19 11:48:16 -06:00
Nicole Thomas
61f8de43df Merge pull request #40756 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-19 11:47:50 -06:00
Mike Place
9f261b35ec Merge pull request #40758 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-19 10:59:55 -06:00
twangboy
9a5671adf8 Fix _build_parent_list function for Py3 2017-04-19 10:36:31 -06:00
Nicole Thomas
f0fb6d3965 Merge pull request #40760 from jf/fix_consul_pillar_doc_writeup 
Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'!
 2017-04-19 09:20:31 -06:00
chqian
f7da655119 Fix an issue where list_pkgs failed to parse 'opkg list-installed' output containing package descriptions. 2017-04-19 22:27:11 +08:00
Jeffrey 'jf' Lim
f45c276775 Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! 2017-04-19 10:44:18 +08:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-18 16:43:11 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
rallytime
0e087323f1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-04-18 16:41:22 -06:00
Mike Place
408699ac54 Merge pull request #40730 from ecdavis/boto_iam-delete-virtual-mfa-device 
Change boto_iam.user_absent state to delete IAM user's virtual MFA device after deactivation.
 2017-04-18 14:44:35 -06:00
Mike Place
421d7be152 Merge pull request #40731 from basepi/sync_fileservers 
Add fileserver syncing
 2017-04-18 14:19:15 -06:00
Mike Place
471a16cdc0 Merge pull request #40732 from basepi/config.get 
Add config runner (config.get for master settings)
 2017-04-18 14:12:34 -06:00
Mike Place
f4c9da2da0 Merge pull request #40733 from rallytime/fix-40435 
Change file data to bytes before attempting to hash
 2017-04-18 14:07:41 -06:00
Mike Place
3557b5140e Merge pull request #40735 from rallytime/handle-cloud-traces 
Handle stacktraces in cloud.action function in module and runner
 2017-04-18 14:05:06 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
Mike Place
78dbab01dc Merge pull request #40740 from cro/minion_delay_start 
Backport pr #39802 to add random_startup_delay
 2017-04-18 13:47:55 -06:00
Mike Place
6c8410e7be Merge pull request #40747 from markuskramerIgitt/variables_naming 
variable names more speaking
 2017-04-18 13:41:57 -06:00
Nicole Thomas
ec32073e9d Merge pull request #40736 from ecdavis/boto_lambda-use-__utils__ 
Change boto_lambda module to use __utils__ instead of salt.utils to allow overriding modules
 2017-04-18 13:37:06 -06:00
Evan Davis
8d634ef389 fix test failures 2017-04-18 11:02:27 -07:00
C. R. Oldham
1460f82ce4 Remove leftover conflict markers (oops! :-/ ) 2017-04-18 10:57:39 -06:00