valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
74,346 Commits 24 Branches 182 Tags 341 MiB
7f968ddb72
Commit Graph

74346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Hammons
7f968ddb72 Remove master installation instructions on Windows 2016-10-20 16:24:06 -07:00
Mike Place
2f25b4f81d Merge pull request #37111 from saltstack/revert-36952-bp-36875 
Revert "Back-port #36875 to carbon"
 2016-10-20 19:50:03 +09:00
Mike Place
3179303a5d Revert "Back-port #36875 to carbon" 2016-10-20 19:49:45 +09:00
Mike Place
f26475753e Merge pull request #37100 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-20 14:40:00 +09:00
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -06:00
Erik Johnson
8d44efed78 Merge pull request #36958 from twangboy/fix_cmd_powershell 
Fix bug where cmd.powershell fails to return
 2016-10-19 11:03:58 -05:00
Thomas S Hatch
beb54b3ffa Merge pull request #37086 from cachedout/mm_req 
Make salt-call a first-class citizen for multi-master
 2016-10-19 09:19:08 -06:00
Mike Place
7dc15c1a48
Lint utils 2016-10-19 16:45:54 +09:00
Mike Place
9bbe3c998b
Lint error in publish 2016-10-19 16:45:08 +09:00
Mike Place
e22a3d2be6
Add multi-master support to publish.publish 2016-10-19 16:42:32 +09:00
Mike Place
7f141ba38c
Add function to search for substr in list 2016-10-19 15:55:02 +09:00
Mike Place
007eef84d7
Extend support to event.fire_master 2016-10-19 15:42:50 +09:00
Mike Place
8171c73b00
Multi-master support for salt-call 2016-10-19 15:38:01 +09:00
Mike Place
6b94153ea6 Merge pull request #36898 from clinta/x509-fixes 
X509 fixes
 2016-10-19 12:03:43 +09:00
Mike Place
a32b8cd741 Merge pull request #37025 from cro/freebsd_no_proc 
Make salt.utils.minion._check_cmdline work on OSes without /proc.
 2016-10-19 12:00:10 +09:00
Mike Place
e09d9f85c5 Merge pull request #37050 from twangboy/fix_win_service_state 
Fix service state for Windows (DO NOT MERGE FORWARD)
 2016-10-19 11:46:27 +09:00
Mike Place
5e998638a4 Merge pull request #37076 from jfindlay/proxy_doc 
Document proxy settings
 2016-10-19 11:30:27 +09:00
Mike Place
9ec366833e Merge pull request #37081 from terminalmage/issue37001 
Fix archive.extracted remote source_hash verification
 2016-10-19 11:22:22 +09:00
Mike Place
67faee1f94 Merge pull request #37064 from cachedout/issue_35097 
Unify job check in scheduler
 2016-10-19 11:08:05 +09:00
Erik Johnson
a3c4deeb82 Fix archive.extracted remote source_hash verification 
When ``file.managed`` is invoked within an archive.extracted state to
pull down the source archive, ``file.extract_hash`` is invoked with
the unique name we created for it, rather than the actual source
filename. This causes hash extraction to fail, or only return a partial
match. Either of these cases causes the ``archive.extracted`` state to
fail.

This commit adds a new optional kwarg to ``file.get_managed`` which can
be used to override which filename we pass to ``file.extract_hash``, and
then passes this kwarg to the ``file.managed`` we invoke from within the
``archive.extracted`` state.
 2016-10-18 16:08:34 -05:00
Justin Findlay
7328df68f5 doc.topic.tutorials.http.query: add proxy section 2016-10-18 10:50:37 -06:00
Justin Findlay
331072b35d doc.topic.tutorials.http.query: add subheadings 2016-10-18 10:50:37 -06:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
Nicole Thomas
a5c26d411d Merge pull request #37073 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-10-18 10:34:49 -06:00
rallytime
b8e215d358 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-18 09:23:58 -06:00
Nicole Thomas
7ef10f6de6 Merge pull request #37072 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-10-18 09:23:17 -06:00
rallytime
78617b4a21 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/profitbricks.py
  - salt/modules/cmdmod.py
  - salt/modules/file.py
 2016-10-18 09:22:18 -06:00
rallytime
78a144f19a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-10-18 09:16:21 -06:00
Clint Armstrong
e732fe7725 fix docs on CSR state 2016-10-18 08:38:54 -04:00
Clint Armstrong
9b6f1a336c fix quotes and remove dependency on pkg_resources 2016-10-18 08:38:41 -04:00
Mike Place
980ba892c9
Unify job check in scheduler 
Refs #35097
 2016-10-18 14:44:09 +09:00
Mike Place
71fd01ab8d Merge pull request #37049 from terminalmage/grains-docs 
Further clarification on new grains docs from #37028
 2016-10-18 10:47:57 +09:00
Mike Place
908383f37b Merge pull request #37051 from twangboy/fix_win_service_state_carbon 
Fix service state for Windows (Carbon)
 2016-10-18 10:38:48 +09:00
Mike Place
7dd91c2880 Merge pull request #37053 from rallytime/update-fedora-install-docs 
Update the Fedora installation docs
 2016-10-18 10:37:45 +09:00
Mike Place
9a6671ce69 Merge pull request #37057 from rallytime/cloud-utils-cleanup 
[2016.3] Update salt.utils.cloud references to __utils__ for cache funcs
 2016-10-18 10:31:43 +09:00
Mike Place
142afd1458 Merge pull request #37058 from rallytime/cloud-utils-cleanup-carbon 
[carbon] Update salt.utils.cloud references to __utils__ for cache funcs
 2016-10-18 10:31:20 +09:00
Erik Johnson
f8cd7b7b28 Merge pull request #36977 from twangboy/fix_cmd_run 
Remove whitespace from string commands
 2016-10-17 17:32:03 -05:00
Erik Johnson
854586c6a4 Add one more paragraph 2016-10-17 17:20:57 -05:00
Erik Johnson
a0502a7b90 Restructure grain writing docs 
Some information recently added is a little redundant. This commit edits
it and restructures the information to make it flow better.
 2016-10-17 17:03:05 -05:00
rallytime
f610297e23 [carbon] Update salt.utils.cloud references to __utils__ for cache funcs 2016-10-17 14:54:02 -06:00
rallytime
2685045013 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs 
Follow up to #35483
 2016-10-17 14:49:36 -06:00
rallytime
d0dc7d4e55 [2016.3] Update salt.utils.cloud references to __utils__ for cache funcs 
Follow up to #35483
 2016-10-17 14:46:22 -06:00
Daniel Wallace
4eb0a89b7c remove options from pylint (#37054) 
These are going to be removed in pylint 1.6, and it doesn't appear that
we are using them, and just causes extra output.
 2016-10-17 14:24:25 -06:00
twangboy
b3b688e298 Fix tests 2016-10-17 13:31:55 -06:00
rallytime
24e0f5e024 Update the Fedora installation docs 
There are no packages available in EPEL starting with Salt version
2015.5.2 through 2016.3.2. Fedora packages are available in EPEL
starting with 2016.3.3. This PR adds a documentation note about this.
 2016-10-17 12:36:59 -06:00
twangboy
6586050736 Move strip to powershell block, add -NoProfile 2016-10-17 11:56:09 -06:00
twangboy
b4766e14a7 Add clarifying comment 2016-10-17 11:15:44 -06:00
twangboy
88da0df824 Set start to manual if disabled on service start 2016-10-17 11:12:08 -06:00
twangboy
1e1ee786c9 Set service to manual if disabled on start 2016-10-17 10:48:40 -06:00
Erik Johnson
4e419e90ac Further clarification on new grains docs from #37028 2016-10-17 11:44:35 -05:00