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
72,203 Commits 24 Branches 182 Tags 341 MiB
a3fda33c42
Commit Graph

72203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
a3fda33c42 Merge pull request #35248 from rallytime/remove-vsphere 
Remove deprecated vsphere cloud driver in Carbon release
 2016-08-06 17:01:39 +09:00
Mike Place
9135b9f8bf Merge pull request #35238 from rallytime/fix-35013 
Add M2Crypto dependency notation to x509 module and state docs
 2016-08-06 16:56:31 +09:00
Mike Place
a55f46f37f Merge pull request #35246 from jtand/py3_versions_support 
Python3 support for versions-report
 2016-08-06 16:56:01 +09:00
rallytime
9216e8ad93 Remove deprecated vsphere cloud driver in Carbon release 
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.

Users will need to use the vmware cloud driver instead.
 2016-08-05 16:16:12 -06:00
Justin Anderson
27e3ff4289 Python3 support for versions-report 2016-08-05 15:38:46 -06:00
rallytime
d0368d5f08 Add M2Crypto dependency notation to x509 module and state docs 
Fixes #35013
 2016-08-05 10:36:51 -06:00
Erik Johnson
05a79a54b1 Merge pull request #35225 from derekmaciel/develop 
Add missing documentation for pkg.installed
 2016-08-05 07:50:02 -05:00
Derek Maciel
a100416382 Add missing documentation for pkg.installed 2016-08-05 00:20:07 -04:00
Thomas S Hatch
e792a4215d Merge pull request #35212 from ngould/requisite-docs 
Improve clarity of requisite docs
 2016-08-04 13:57:15 -06:00
Nathan Gould
3683f9a715 Improve clarity of requisite docs 
Docs should stick to the terms "required" vs. "dependent", where required means the state that has to happen first, and dependent means the state that relies on the required state.
 2016-08-04 15:14:39 -04:00
Thomas S Hatch
da6107647d Add some release notes on features for carbon (#35188) 
* Add initial relnotes for ceph, docker and thorium stuff

* more
 2016-08-03 17:01:41 -06:00
Nicole Thomas
60ab53047c Merge pull request #35185 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-03 16:58:29 -06:00
rallytime
df5f3d45a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-08-03 15:06:17 -06:00
Nicole Thomas
bd0496eef5 Merge pull request #35182 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-03 14:57:29 -06:00
Erik Johnson
fbede2a471 Merge pull request #35119 from derekmaciel/develop 
Assume two EVRs are equal if E and V are equal but one R is missing.
 2016-08-03 15:07:09 -05:00
Nicole Thomas
656dff554c Fix up pylint for develop branch (#35176) 2016-08-03 13:51:03 -06:00
rallytime
c35974f78f Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-03 13:36:00 -06:00
Nicole Thomas
67d8dd0fd0 Don't discard running beacons config when listing becaons (#35174) 
Refs #34827
 2016-08-03 13:35:14 -06:00
Derek Maciel
41fba278de Revise unnecessary code duplication 2016-08-03 14:46:21 -04:00
Derek Maciel
9192e1b155 Fix formatting 2016-08-03 14:44:37 -04:00
Derek Maciel
f6eb5d061f Assume two EVRs are equal if E and V are equal but one R is missing. 2016-08-03 14:43:03 -04:00
Mike Place
1f989e720a Merge pull request #35172 from DSRCompany/issues/28785_minion_ret_dup 
Don't run the same job twice on the same minion.
 2016-08-04 02:16:56 +09:00
Nicole Thomas
3754550dd2 Add missing CLI Examples to aws_sqs module funcs (#35173) 2016-08-03 11:14:13 -06:00
Dmitry Kuzmenko
192ccabd30 Don't run jid twice on the same minion. 2016-08-03 18:32:16 +03:00
Mike Place
b466d84664 Merge pull request #35170 from lingonl/develop 
Re-implemented ipset.check to support larger subnets.
 2016-08-03 23:14:04 +09:00
Mike Place
db68d2cacb Merge pull request #35037 from twangboy/int_tests_sysmod 
Fix sysmod integration tests on Windows
 2016-08-03 07:59:00 -06:00
Mike Place
f9f92ad326 Merge pull request #35150 from rallytime/2016.3.3-release-notes 
Start release notes for 2016.3.3
 2016-08-03 07:46:31 -06:00
Mike Place
99bd7b7e3c Merge pull request #35151 from terminalmage/py3tests-integration-output 
Fix integration.output tests for PY3
 2016-08-03 07:46:16 -06:00
Mike Place
518ecf897a Merge pull request #35157 from hu-dabao/func-return-string 
master returned from func should be a string as designed so far
 2016-08-03 07:29:16 -06:00
Mike Place
50e745faab Merge pull request #35161 from jf/refactor_sys.list_functions 
Refactor sys.list_functions
 2016-08-03 07:25:08 -06:00
lingo
d9b05810b8 Re-implemented ipset.check to support larger subnets. 
see: https://github.com/saltstack/salt/issues/35149
 2016-08-03 15:00:02 +02:00
Jeffrey 'jf' Lim
dd6ebed1d6 Refactor sys.list_functions 2016-08-03 15:15:47 +08:00
Hengyang Hu
a7506af4c9 master returned from func should be a string as designed so far 2016-08-02 17:27:26 -07:00
twangboy
dee18a39fb Fix typos 2016-08-02 17:33:20 -06:00
twangboy
8626a20942 Add missing docs and cli examples 2016-08-02 17:33:20 -06:00
twangboy
b00b3c4e65 Fix tests 2016-08-02 17:33:20 -06:00
Mike Place
2ad9efe47a Merge pull request #35153 from cachedout/disable_init_test 
Disable init script test temporarily
 2016-08-02 16:41:32 -06:00
Mike Place
59dbb05db6 Disable init script test temporarily 
This will be re-enabled later on.
 2016-08-03 07:40:30 +09:00
Mike Place
ca000606b3 Merge pull request #35152 from cachedout/fix_salt_test_timeout 
Fix error in passing timeout for salt tests
 2016-08-02 16:31:33 -06:00
Mike Place
c69643d4ef Fix error in passing timeout for salt tests 2016-08-03 07:30:09 +09:00
Erik Johnson
6e87089438 Use .decode() to avoid exception trying to write bytestring 2016-08-02 17:25:52 -05:00
Erik Johnson
5d40ffff01 Use a path that non-root users can write to for output file 2016-08-02 17:25:22 -05:00
rallytime
a64026fc99 Start release notes for 2016.3.3 2016-08-02 15:47:17 -06:00
Nicole Thomas
ddbc5349a6 Merge pull request #35144 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-02 15:16:44 -06:00
Daniel Wallace
87c39d8fcb don't deprecate openstack until Nitrogen (#35148) 2016-08-02 14:31:00 -06:00
rallytime
f76cf617a7 Pylint fix 2016-08-02 14:23:20 -06:00
Jacob Hammons
f4d869fb0f doc version updated to 2016.3.2 (#35147) 
updated the navigation headings
 2016-08-02 14:21:52 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
Mike Place
0329f57bd0 Merge pull request #35146 from cachedout/fixup_34827 
Don't discard running beacons config when listing becaons
 2016-08-02 13:52:36 -06:00
Mike Place
8547c88549 Don't discard running beacons config when listing becaons 
Refs #34827
 2016-08-03 04:50:32 +09:00