valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,088 Commits 24 Branches 182 Tags 341 MiB
b5179aa873
Commit Graph

81088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
b5179aa873 Merge pull request #40778 from rallytime/oxygen-deprecations 
Start removing deprecated code for Oxygen release
 2017-04-23 04:30:51 -06:00
Mike Place
0093851334 Merge pull request #40782 from wolfpackmars2/patch-6 
Add kernelversion grain
 2017-04-23 04:24:36 -06:00
Mike Place
03a7d2ef01 Merge pull request #40825 from sjorge/mdata-grains 
Move mdata grains from core.py to mdata.py
 2017-04-23 04:23:18 -06:00
Mike Place
282fc051e6 Merge pull request #40839 from cst05001/develop 
try to fix a modules.file.line bug
 2017-04-23 04:06:09 -06:00
Mike Place
6da806d1cc Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion 
Fix endpoint handling per region
 2017-04-23 04:00:00 -06:00
方云麟
d4b1465159 re.search in function _regex_to_static() should support re.MULTILINE or cause bug 
modified:   file.py
 2017-04-23 14:29:05 +08:00
C. R. Oldham
9293c1e8f0 Merge pull request #40829 from Ch3LL/disk_nebula 
Add option to expand disk size in nebula
 2017-04-22 10:37:53 -06:00
Ch3LL
d1eb2b8e09
fix where clone check happens 2017-04-21 18:16:19 -04:00
Ch3LL
704048be30
add spaces for code in docs 2017-04-21 16:10:31 -04:00
Ch3LL
09f7b3a500
add title 2017-04-21 16:08:52 -04:00
Ch3LL
f0ff969c6a
add ability to expand disk size on creation of vm in nebula 2017-04-21 16:05:18 -04:00
Nicole Thomas
15e39d8978 Merge pull request #40823 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-04-21 14:02:43 -06:00
Mike Place
767f6650b5 Merge pull request #40786 from bodhi-space/infra4728 
INFRA-4728 - boto3_sns execution and state modules
 2017-04-21 12:10:05 -06:00
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
Super-User
65d638801b Properly parse SDC grains defined in spec 2017-04-21 18:29:30 +02:00
rallytime
a7eb8f717e Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-21 09:50:25 -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
Super-User
4c6de322d0 Add mdata grains as separate module 2017-04-21 17:28:35 +02:00
Nicole Thomas
9e9d5ad0a9 Merge pull request #40810 from rallytime/fix-tls-test-failure 
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict.
 2017-04-21 09:25:44 -06:00
Super-User
ac082f1935 Optimize BrandZ detection and remove mdata grains 
We can use os.uname() to detect if we are running in a LX zone on
SmartOS. This saves us one fork/exec.

The mdata stuff has also been removed from the core grain module.
A seperate grain module will be take it's place. This to improve
the core grains readability and to nicely seperate out the
functionality.
 2017-04-21 16:51:33 +02:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874 
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
 2017-04-21 15:48:52 +02: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
aba6e0bb2d Merge pull request #40807 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-20 17:05:40 -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
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict 
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
 2017-04-20 17:02:33 -06:00
rallytime
615448a3f3 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/utils/s3.py
 2017-04-20 13:47:02 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-20 13:44:37 -06:00
Nicole Thomas
2ab42489df Merge pull request #40797 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-20 13:42:03 -06:00
Nicole Thomas
ced839f841 Merge pull request #40800 from rallytime/bp-40720 
Back-port #40720 to 2016.11
 2017-04-20 13:41:40 -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
Tom Williams
9756c86ea8 INFRA-4728 - docstring fix 2017-04-20 13:54:07 -04:00
Ken Crowell
6c0124ae21 Call tornado.httputil.url_concat compatibly 
See https://github.com/tornadoweb/tornado/pull/1899.
 2017-04-20 11:37:20 -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
rallytime
22500a7261 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/utils/s3.py
 2017-04-20 11:18:43 -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
rallytime
6d59ed9481 Remove unused import 2017-04-20 11:05:46 -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
623e2eb61f Merge pull request #40791 from a-powell/s3-util-get-memory-fix 
S3 util get memory fix
 2017-04-20 10:32:26 -06:00
Tom Williams
8773cbb860 INFRA-4728 - pylint fixes 2017-04-20 12:24:40 -04:00