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
86,801 Commits 24 Branches 182 Tags 341 MiB
651631d60a
Commit Graph

7730 Commits

Author SHA1 Message Date
Erik Johnson
7a2f12b96a Include a better example for reactor in master conf file 2017-09-18 16:07:36 -04:00
Mike Place
1a619708c1 Enhance engines docs 
Add a note about formatting to make it more clear.
 2017-09-18 13:44:44 -06:00
Mike Place
56b671e087 Merge pull request #43330 from terminalmage/issue43077 
Fix reactor regression + unify reactor config schema
 2017-09-18 10:46:10 -06:00
Dmitry Kuzmenko
14bf2dd8ff Support regex in publisher_acl. 2017-09-18 18:38:44 +03:00
haam3r
58f7d051c9 Issue #43479 No runners.config in 2017.7 branch 
Add extra note about needing to import the runners.config module from the develop branch when running on a 2017.7 release.
 2017-09-14 23:01:53 +03:00
Damon Atkins
b3dbafb035 Update doco 2017-09-14 12:28:23 -04:00
Damon Atkins
d4981a2717 Update doco 2017-09-14 12:25:30 -04:00
Erik Johnson
b85c8510c7 Improve the reactor documentation 
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
 2017-09-13 10:35:23 -05:00
Erik Johnson
20f6f3cc39 Include a better example for reactor in master conf file 2017-09-13 10:35:23 -05:00
Mike Place
5378ac7756 Merge pull request #41547 from cloudflare/px_merge_pillar_opts 
Override proxy minion opts with pillar data
 2017-09-11 15:47:50 -06:00
rallytime
ef7b4242c3 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-11 12:24:10 -04:00
rallytime
68f529ee5e Add 2016.11.8 release notes 2017-09-11 10:58:16 -04:00
Nicole Thomas
e638fac54e Merge pull request #43325 from doesitblend/salt-mine-doc-fix 
mine_interval option is minutes not seconds
 2017-09-07 12:58:10 -04:00
Nicole Thomas
d97a680372 Merge pull request #43333 from damon-atkins/2016.11 
Docs are wrong cache_dir (bool) and cache_file (str) cannot be passed as params + 1 bug
 2017-09-06 10:21:34 -04:00
rallytime
7b07b58396 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/key.py
  - salt/modules/yumpkg.py
 2017-09-06 09:44:34 -04:00
Damon Atkins
92de2bb498 Update doco 2017-09-06 12:31:51 +10:00
Mircea Ulinic
aad39ba665 Document the new opts 2017-09-04 14:17:14 +00:00
Ken Jordan
ba0cdd4536 Fix phrasing for mine_interval description 2017-09-01 15:13:20 -06:00
Ken Jordan
9ff03c2d43 Update Salt Mine documentation to show that the mine_interval option is configured in minutes. 2017-09-01 14:57:10 -06:00
rallytime
0d5a46dbaa Update release branch section with a few more details 2017-08-29 09:38:11 -04:00
rallytime
d40eba6b37 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/states/git.py
 2017-08-25 16:07:27 -04:00
Ch3LL
1b24244bd3 Add New Release Branch Strategy to Contribution Docs 2017-08-24 12:51:00 -04:00
rallytime
bcbe180fbc Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-08-23 10:08:09 -04:00
Denys Havrysh
af743ff6c3 [DOCS] Add missing utils sub-dir listed for extension_modules 2017-08-22 12:18:42 +03:00
rallytime
84829a6f8c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/jenkins.py
  - salt/states/jenkins.py
 2017-08-18 09:13:54 -04:00
garethgreenaway
51d16840bb Merge pull request #42890 from DSRCorporation/bugs/42627_salt-cp 
Make chunked mode in salt-cp optional
 2017-08-17 11:37:43 -07:00
Dmitry Kuzmenko
cfddbf1c75 Apply code review: update the doc 2017-08-17 16:47:45 +03:00
rallytime
8a0f948e4a Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/utils/versions.py
  - tests/unit/modules/test_boto_elb.py
  - tests/unit/modules/test_boto_secgroup.py
  - tests/unit/states/test_boto_vpc.py
 2017-08-17 09:10:31 -04:00
rallytime
566ba4fe76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/conf.py
 2017-08-17 09:03:44 -04:00
Denys Havrysh
44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix 2017-08-16 10:26:45 +03:00
Ch3LL
cbecf65823 [2017.7] Bump latest and previous versions 2017-08-15 12:55:02 -04:00
Ch3LL
74e7055d54 [2016.11] Bump latest and previous versions 2017-08-15 12:54:12 -04:00
Ch3LL
b551e66744 [2016.3] Bump latest and previous versions 2017-08-15 12:53:16 -04:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00
Ch3LL
d75d3741f8 Add Security Notice to 2016.3.7 Release Notes 2017-08-15 12:33:27 -04:00
amalleo25
4e46c968e6 Update joyent.rst 
Missing colon in example cloud.profiles.d config file.
 2017-08-14 14:35:50 -04:00
Dmitry Kuzmenko
afedd3b654 Typos and version fixes in the doc. 2017-08-14 18:08:40 +03:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-14 10:16:19 -04:00
Mircea Ulinic
93be79a135 Index eos under the installation instructions list 2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39 Minor eos doc correction 2017-08-12 23:11:25 +01:00
Dmitry Kuzmenko
999388680c Make chunked mode in salt-cp optional (disabled by default). 
This reverts breaking of backward compatibility related to the cp.recv
interface change.
 2017-08-11 22:44:42 +03:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Nicole Thomas
3b9c3c5671 Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs 
Adding missing output flags to salt cli docs
 2017-08-11 14:35:18 -04:00
Nicole Thomas
459fdedc67 Merge pull request #42678 from frankiexyz/2017.7 
Add eos.rst in the installation guide
 2017-08-11 09:58:36 -04:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
Robert James Hernandez
744bf954ff Adding missing output flags to salt cli 2017-08-10 13:19:08 -07:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-08-10 14:51:27 -04:00
rallytime
152eb88d9f Update modules --> states in kubernetes doc module 
The kubernetes state docs are not rendering/building due to a typo
in the doc module.

Fixes #42639
 2017-08-08 14:42:34 -04:00
Ch3LL
90a2fb66a2 Fix typo for template_dict in http docs 2017-08-07 16:45:42 -04:00
Daniel Wallace
bca17902f5 add version added info 2017-08-03 09:01:34 -06:00
Daniel Wallace
4bbfc751ae render kubernetes docs 2017-08-03 09:01:34 -06:00
Frankie Hui
1598571f52 Add eos.rst in the installation guide 2017-08-02 17:47:31 +08:00
Mike Place
fb81e78f71 Merge pull request #42603 from twangboy/win_fix_runas 
Add runas_passwd as a global for states
 2017-07-31 14:49:48 -05:00
twangboy
464ec34713 Fix another instance of runas_passwd 2017-07-28 11:20:48 -06:00
twangboy
4ea264e3db Change to runas_password in docs 2017-07-28 10:16:38 -06:00
Nicole Thomas
e2dd443002 Merge pull request #42601 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-27 16:32:06 -06:00
Nicole Thomas
22eea389fa Merge pull request #42290 from isbm/isbm-module_run_parambug_42270_217 
Backport of #42270
 2017-07-27 16:30:05 -06:00
twangboy
b9c91eba60 Add runas_passwd as a global for states 2017-07-27 15:46:58 -06:00
rallytime
36a1bcf8c5 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_wua.py
  - salt/utils/schedule.py
  - tests/unit/modules/rabbitmq_test.py
 2017-07-27 14:00:15 -06:00
Mike Place
535c922511 Merge pull request #42523 from rallytime/fix-42375 
Add a mention of the True/False returns with __virtual__()
 2017-07-27 13:13:06 -05:00
rallytime
46715e9d94 Merge branch '2017.7.1' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.1.rst
 2017-07-26 14:29:24 -06:00
rallytime
7bcaa5a4cc small markup fix for title 2017-07-26 09:00:45 -06:00
Ch3LL
d066b599ca add changelog to 2017.7.1 release notes 2017-07-26 09:00:34 -06:00
Ch3LL
fb69e71093 add changelog to 2017.7.1 release notes 2017-07-25 21:10:58 -04:00
rallytime
685c2cced6 Add information about returning a tuple with an error message 2017-07-25 14:44:18 -06:00
Daniel Wallace
b7ebb4d81a these drivers do not actually have an issue. 
Joyent does not use apache-libcloud, and is the only one with this issue.
 2017-07-24 15:12:40 -06:00
rallytime
fa466519c4 Add a mention of the True/False returns with __virtual__() 
And their relationship to `__virtualname__`.

Fixes #42375
 2017-07-24 13:58:16 -06:00
rallytime
e3a6717efa Add info about top file to pillar walk-through example to include edit.vim 
The pillar example in the "Pillar Makes Simple States Grow Easily" section does
not meniton that the new file `/srv/pillar/edit/vim.sls` created for the example
must be included in the pillar top file in order for the references to work.

This PR adds that documentation so that the example works correctly.

Fixes #42405
 2017-07-24 12:17:41 -06:00
Nicole Thomas
c91a5e539e Merge pull request #42425 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-21 16:43:41 -06:00
Nicole Thomas
994d3dc74a Merge pull request #42454 from terminalmage/jinja-docs-2017.7 
Document future renaming of new rand_str jinja filter
 2017-07-21 12:47:50 -06:00
Ch3LL
c10196f68c update windows urls to new py2/py3 naming scheme 2017-07-21 11:22:57 -06:00
Erik Johnson
98b661406e Document future renaming of new rand_str jinja filter 
The name and the documentation for this filter are entirely inaccurate
for what it actually does. It will be renamed in the Oxygen release.
 2017-07-21 09:21:38 -05:00
Ch3LL
3f4a918f73 update windows urls to new py2/py3 naming scheme 2017-07-21 09:45:30 -04:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
Ch3LL
ce1c1b6d28 Add initial 2017.7.1 Release Notes File 2017-07-18 18:51:27 -04:00
Nicole Thomas
a175c40c1d Merge pull request #42364 from twangboy/release_notes_2017.7.0 
Windows Package notes for 2017.7.0
 2017-07-18 13:24:45 -06:00
Nicole Thomas
f06a6f1796 Merge pull request #42360 from Ch3LL/doc-update-2016.11 
[2016.11] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:29 -06:00
Nicole Thomas
4dfe50e558 Merge pull request #42361 from Ch3LL/doc-update-2017.7 
[2017.7] Update version numbers in doc config for 2017.7.0 release
 2017-07-18 13:23:22 -06:00
Nicole Thomas
587138d771 Merge pull request #42363 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-18 12:40:48 -06:00
Nicole Thomas
e0595b0a0f Merge pull request #42319 from rallytime/config-docs 
Add more documentation for config options that are missing from master/minion docs
 2017-07-18 12:02:31 -06:00
Nicole Thomas
ba799b2831 Merge pull request #42179 from rallytime/fix-42151 
Fix some documentation issues found in jinja filters doc topic
 2017-07-18 12:01:56 -06:00
twangboy
96517d1355 Add note about patched windows packages 2017-07-18 10:06:55 -06:00
rallytime
7aa31ff030 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/git.py
  - salt/modules/pillar.py
  - salt/states/saltmod.py
  - salt/states/user.py
  - tests/integration/states/handle_iorder.py
 2017-07-18 09:05:43 -06:00
Ch3LL
dc5bb301f7 [2017.7] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:56:56 -04:00
Ch3LL
b90b7a7506 [2016.11] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:54:46 -04:00
Ch3LL
dc85b5edbe [2016.3] Update version numbers in doc config for 2017.7.0 release 2017-07-17 16:50:54 -04:00
Mike Place
c84d6db548 Merge pull request #42186 from rallytime/fix-42166 
Use long_range function for IPv6Network hosts() function
 2017-07-17 13:39:35 -05:00
Mike Place
866a1febb4 Merge pull request #42264 from rallytime/fix-41116 
Update minion restart section in FAQ doc for windows
 2017-07-17 12:40:39 -05:00
Mike Place
e588f235e0 Merge pull request #42269 from rallytime/fix-41721 
Add some clarity to "multiple quotes" section of yaml docs
 2017-07-17 12:38:17 -05:00
Mike Place
8f1cb287cf Merge pull request #42126 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-07-17 12:07:18 -05:00
rallytime
b40f980632 Add more documentation for config options that are missing from master/minion docs 2017-07-14 17:26:02 -06:00
rallytime
c406046940 Add clarification to salt ssh docs about key auto-generation. 
Fixes #42267
 2017-07-14 11:57:58 -06:00
Bo Maryniuk
e38d432f90 Fix docs 2017-07-13 10:11:32 +02:00
Bo Maryniuk
1e8a56eda5 Describe function tagging 2017-07-13 10:11:21 +02:00
Bo Maryniuk
1d7233224b Describe function batching 2017-07-13 10:11:13 +02:00
Bo Maryniuk
1391a05d5e Bugfix: syntax error in the example 2017-07-13 10:11:07 +02:00
rallytime
f2250d474a Add a note about using different styles of quotes. 2017-07-12 17:08:23 -06:00
rallytime
bd638880e3 Add mono-spacing to salt-minion reference for consistency 2017-07-12 09:36:07 -06:00
Denys Havrysh
6bb8b8f98c Add missing doc for `utils_dirs` Minion config option 2017-07-12 11:08:34 +03:00
Denys Havrysh
f1bc58f6d5 Utils: add example of module import 2017-07-12 11:08:34 +03:00
rallytime
38d9b3d553 Add some clarity to "multiple quotes" section of yaml docs 
Fixes #41721
 2017-07-11 17:28:45 -06:00
rallytime
30d62f43da Update minion restart section in FAQ doc for windows 
Fixes #41116
 2017-07-11 16:24:29 -06:00
Thomas Dutrion
c31ded341c Remove duplicate instruction in Openstack Rackspace config example 2017-07-11 16:01:15 -06:00
rallytime
798d29276e Add note about "to_bytes" jinja filter issues when using yaml_jinja renderer 2017-07-07 15:14:06 -06:00
rallytime
b8bcc0d599 Add note to various network_hosts docs about long_run for IPv6 networks 2017-07-06 17:36:18 -06:00
rallytime
1bbff572ab Fix some documentation issues found in jinja filters doc topic 
These doc issues were all found in issue #42151. This commit takes
care of all of the issues presented in #42151 except for the last
task.
 2017-07-06 11:46:23 -06:00
Arthur Lutz
686926daf7 Update aws.rst - add Debian default username 2017-07-06 11:08:06 -06:00
Nicole Thomas
678d4d4098 Merge pull request #42141 from rallytime/bp-42098 
Back-port #42098 to 2016.11
 2017-07-06 09:11:49 -06:00
Ch3LL
e1694af39c Update builds available for rc1 2017-07-05 17:06:06 -04:00
twangboy
bd80243233 Change repo_ng to repo-ng 2017-07-05 13:56:11 -06:00
Nicole Thomas
afc19048bd Merge pull request #42131 from gtmanfred/release 
Add stuff to release notes
 2017-07-05 13:33:14 -06:00
Daniel Wallace
e2b3160c96 fix up PR 2017-07-05 10:41:26 -06:00
Daniel Wallace
6fbde35d11 add note about roster_defaults 2017-07-05 10:23:07 -06:00
Daniel Wallace
ea5ae2e468 add release note about about extmod blacklist and whitelist 2017-07-05 10:23:07 -06:00
Daniel Wallace
db0ed458d8 Update salt-master first before updating salt-minion 
Fixes #42124
 2017-07-05 10:23:07 -06:00
rallytime
8b35b367b3 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
 2017-07-05 09:14:30 -06:00
Ch3LL
d4e7b91608 Update releasecanddiate doc with new 2017.7.0rc1 Release 2017-07-03 23:06:54 -04:00
rallytime
c2822e05ad Remove references in docs to pip install salt-cloud 
Instead, provide the option to use "-L" with the Bootstrap script.

Fixes #41885
 2017-07-03 14:47:36 -06:00
twangboy
5a5d70866a Change repo_ng to repo-ng 2017-07-03 14:15:35 -06:00
Mike Place
ec378c73ff Merge pull request #42020 from terminalmage/toctree-fix 
Add the new docker state modules to the toctree
 2017-06-30 15:58:27 -05:00
rallytime
c98470e557 Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-06-30 10:00:10 -06:00
Ch3LL
1de5e008a0 Add initial 2016.11.7 Release Notes 2017-06-30 11:32:10 -04:00
rallytime
3b87dbca12 Add the 'provider' key to salt.cloud.CloudClient.create() 
Much like how the 'profile' key exists in this function, the
'provider' key must also exist for other salt-cloud functions
to work properly. Various salt-cloud functions rely on provider
being available (as it is always available when using cloud profiles),
and so it should be available when no profile is used as well.

Also adjusted some rst syntax in the cloud config file as well
as the documentation around the create() function. Passing in
kwargs as the docs originally suggested does not work.

Fixes #41971
 2017-06-29 14:38:09 -06:00
Seth House
18dfa9893c Re-add msgpack to mocked imports 2017-06-29 13:49:45 -06:00
Seth House
5592e6e5d4 Revert "Allow docs to be built under Python 3" 2017-06-29 13:32:09 -06:00
Erik Johnson
bfa9836336 Add the new docker state modules to the toctree 2017-06-29 12:31:58 -05:00
Erik Johnson
f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
 2017-06-28 20:27:32 -05:00
David Boucha
bff050ad52 change out salt support link to SaltConf link 2017-06-28 14:54:01 -06:00
rallytime
7d7be2d375 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/ref/configuration/master.rst
  - tests/integration/states/test_archive.py
  - tests/unit/transport/test_tcp.py
  - tests/unit/transport/test_zeromq.py
 2017-06-28 10:48:37 -06:00
Ch3LL
2516ae1349 [2016.3] Bump latest release version to 2016.11.6 2017-06-28 11:24:57 -04:00
Ch3LL
fe4f5711d5 [2016.11] Bump latest release version to 2016.11.6 2017-06-28 11:24:17 -04:00
Mike Place
7aacddf6ef
Allow docs to be built under Python 3 2017-06-27 11:46:47 -06:00
Mike Place
ff67d47a2e Merge pull request #41516 from kstreee/fix-blocking-waiting-tcp-connection 
Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications.
 2017-06-26 09:41:38 -05:00
Bo Maryniuk
c2b5e50d50 Add missing doc info for pressrelease 2017-06-26 14:38:19 +02:00
Mike Place
c89cd2a4bf Merge pull request #41890 from cachedout/locale_doc 
Locale doc
 2017-06-22 12:34:46 -05:00
Mike Place
df5a112a9b Merge pull request #41904 from twangboy/docs_win_add_firewall 
Fix anchor to _linux-iptables
 2017-06-22 11:16:23 -05:00
twangboy
d49bfd02a4 Fix anchor to _linux-iptables 2017-06-22 09:46:29 -06:00
Mike Place
3bc07d2f7c
Line breaks 2017-06-22 09:24:55 -06:00
Mike Place
679040c04b
Locale doc 2017-06-21 16:06:59 -06:00
Ch3LL
4e1239d980 Add additional commits to 2016.11.6 release notes 2017-06-21 17:15:11 -04:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py 
Update 2017 Release Notes with Python Messages
 2017-06-20 12:17:04 -05:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers 
Things, that didn't made to 2017.7 for some reasons
 2017-06-20 09:28:21 -05:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
Mike Place
a4195f5246 Merge pull request #41841 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-19 18:01:11 -05:00
rallytime
2cfabc467c Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/req.txt
  - salt/modules/dockermod.py
 2017-06-19 14:17:01 -06:00
C. R. Oldham
16a05a5554 Fix backticks and dropped clause. 2017-06-19 14:03:34 -06:00
C. R. Oldham
a6025c3c66 Clarify some LDAP issues driven by #38259 and #38293 2017-06-19 12:46:28 -06:00
Bo Maryniuk
fe97520bc7 Merge branch '2017.7' into isbm-suse-upstream-leftovers 2017-06-19 15:21:13 +02:00
Mircea Ulinic
fae959d24b Remove duplicate mattermost ref 2017-06-19 09:52:54 +00:00
Mircea Ulinic
d8dc8a338b Add redis cache reference 2017-06-19 09:52:33 +00:00
Mircea Ulinic
fd28d3385c Adding Jinja cross ref 2017-06-19 09:49:45 +00:00
garethgreenaway
4c8aa25080 Merge pull request #41813 from rallytime/add_new_doc_modules 
Add new documentation file references to build system for 2017.7
 2017-06-16 18:54:15 -07:00
Nicole Thomas
c3a49c9552 Merge pull request #41805 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-16 16:01:06 -06:00
Nicole Thomas
4c9a73d75f Merge pull request #41728 from twangboy/win_install_docs 
Win install docs
 2017-06-16 15:41:21 -06:00
rallytime
ff277bc458 Add new documenation file references to build system for 2017.7 2017-06-16 21:17:33 +00:00
rallytime
58262608cd Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/master.py
  - salt/modules/zypper.py
  - tests/unit/modules/timezone_test.py
 2017-06-16 10:43:02 -06:00
Bo Maryniuk
e9de0746ae Fix grain for os_family on SUSE series 2017-06-16 14:39:08 +02:00
rallytime
c828ad803a Add a bunch of config options to the various master/minion files that are missing 
I started on these a while ago and never submitted them. I added a couple more today
and figured I should get these in.

Refs #32400
 2017-06-15 16:21:47 -06:00
Mike Place
a46f6809df Merge pull request #41758 from twangboy/docs_win_add_master_config 
Add Windows Master config information
 2017-06-15 15:29:27 -05:00
twangboy
b6201bac33 Fix version numbers 2017-06-15 09:53:57 -06:00
twangboy
c3dc38587e Fix indentation 2017-06-15 09:49:13 -06:00
Mike Place
c58f3811ce Merge pull request #41746 from rallytime/version-added-nitrogen 
Update Nitrogen references to 2017.7.0
 2017-06-15 10:12:18 -05:00
Mike Place
e685858269 Merge pull request #41750 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-06-14 17:15:40 -05:00
twangboy
80ac6381c2 Add Windows Master config information 2017-06-14 15:15:46 -06:00
Ch3LL
fa368f21ac
Add Change Log to 2016.11.6 Release Notes 2017-06-14 16:00:50 -04:00
rallytime
89834e49c2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - conf/master
  - salt/utils/schedule.py
 2017-06-14 13:24:11 -06:00
twangboy
795a1aab4f Add instructions for Windows Firewall 2017-06-14 11:42:00 -06:00
rallytime
c5b75d030a Update Nitrogen references to 2017.7.0 in doc/* 2017-06-14 11:36:06 -06:00
twangboy
45975e299e Remove reference to Salt Enterprise 2017-06-14 09:39:29 -06:00
Mike Place
4b43ba3366 Merge pull request #41585 from cro/sign_minion_messages 
Sign_minion_messages support
 2017-06-13 16:14:40 -05:00
twangboy
22601201c4 Add note about salt-master on Windows 2017-06-13 15:09:38 -06:00
twangboy
d67c1dfbf7 Remove references to salt master installation 2017-06-13 15:02:44 -06:00
rallytime
bdf33d7f5f Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-06-13 09:26:05 -06:00
rallytime
5150916556 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/parted.py
 2017-06-12 20:10:45 -06:00
Erik Johnson
6ec9dfb7f3 Update version in master-tops docs 
This paragraphs is referring to #37322, which was pushed to Oxygen.
 2017-06-12 17:20:09 -05:00
rallytime
c91ca5f809 Remove note about version incompatibility with salt-cloud 
The note references very old versions of salt + salt-cloud and since
salt-cloud has been incorporated into salt for quite some time, this
notice is no longer needed.
 2017-06-12 11:16:52 -06:00
C. R. Oldham
dadf4b851c Add documentation to the example master and minion configuration files. 
Move minion event signing to a saner place.
Enable dropping messages when signature does not verify or when
minion is not adding the signature to its payloads.
 2017-06-08 13:18:53 -06:00
Mike Place
94aa1876d4 Merge pull request #41546 from cloudflare/dns-grains 
Add host_dns grain for napalm
 2017-06-06 15:00:07 -05:00
Mircea Ulinic
564f2d1e3d Indent correctly the code block 2017-06-06 15:23:14 +00:00
Mircea Ulinic
b70df6e576 Reference new Jinja filters in the release notes 2017-06-06 15:15:06 +00:00
Mircea Ulinic
406e582479 Small adjustment 2017-06-06 15:14:47 +00:00
Mircea Ulinic
62cb2a1c7a More jinja references 2017-06-06 15:05:50 +00:00
Mircea Ulinic
bba8c27873 Restructure the Jinja topic to have refrences 2017-06-06 14:56:21 +00:00
Mircea Ulinic
2a8c5cef04 Add notes regarding other new features 2017-06-06 14:18:01 +00:00
Mircea Ulinic
b59760fae2 Fix indentation for better display 2017-06-06 13:52:01 +00:00
Mircea Ulinic
ad4e6e5ec5 salt.beacons.log instead of 'Log' 2017-06-06 13:46:38 +00:00
Mircea Ulinic
36985bb1ed Remove service state, not a new one 2017-06-06 13:45:02 +00:00
Mircea Ulinic
b6b6a51846 Index new modules introduced in Nitrogen 2017-06-06 13:41:32 +00:00
Mircea Ulinic
6b1b05129c Remove the reference to the profile outputter 2017-06-06 12:49:04 +00:00
Mircea Ulinic
fb12353a1d Insert note in the Nitrogen release 2017-06-01 11:42:53 +00:00
kstreee
94b9ea51eb Implements MessageClientPool to avoid blocking waiting for zeromq and tcp communications. 2017-05-31 18:28:18 +09:00
Mike Place
cec5af7ce3 Merge pull request #41437 from Ch3LL/fix_gce_net 
Remove ex_subnetwork requirement for GCE
 2017-05-26 17:04:06 -05:00
rallytime
de85b49b90 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/config/__init__.py
  - salt/modules/cp.py
  - salt/states/saltmod.py
  - salt/utils/__init__.py
  - salt/utils/gzip_util.py
  - tests/integration/shell/test_cp.py
 2017-05-26 11:11:54 -06:00
Nicole Thomas
5bb9dac9ec Merge pull request #41413 from gtmanfred/nitrogen 
Write tests for Venafi runner
 2017-05-26 10:09:23 -06:00
Nicole Thomas
824f2d3b69 Merge pull request #41398 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-26 09:17:48 -06:00
Ch3LL
3f94964801
Remove ex_subnetwork requirement for GCE 2017-05-25 16:25:12 -04:00
Daniel Wallace
6dfb63f15d add venafi to table of contents 2017-05-25 10:27:40 -06:00
Daniel Wallace
343a0b206c fix doc 2017-05-25 10:26:54 -06:00
wgoulet
44dec966c8 Updated documentation for Venafi module with better examples & clarifications 2017-05-25 10:26:54 -06:00
David Boucha
5eb27571a0 Correct doc to actually blacklist a module 2017-05-24 17:22:36 -06:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
d2d9a3d29f Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/cli/salt-cp.rst
  - salt/config/__init__.py
 2017-05-23 15:58:14 -06:00
Ch3LL
0d3f5da0ec add spaces for code in docs 2017-05-23 11:35:20 -06:00
Ch3LL
42e614bb7d add title 2017-05-23 11:35:20 -06:00
Ch3LL
b02ec97cff add ability to expand disk size on creation of vm in nebula 2017-05-23 11:35:20 -06:00
Benjamin Drung
5b79a0a9f8 Do not require sphinx-build for cleaning docs 
In a minimal build environment (no sphinx), the package cannot initially
clean itself because the upstream doc/Makefile checks for sphinx-build
executable and Debian doesn't get any benefit of that.

Thus do not check for the presence of sphinx-build when running the
clean or help target by adding a phony check_sphinx-build that does the
check for sphinx-build.

Debian bug: https://bugs.debian.org/851559
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-23 17:14:11 +02:00
Mike Place
337d00fbf9 Merge pull request #41352 from whiteinge/rest_cherrypy-cors-token 
rest_cherrypy CORS fix & /token endpoint
 2017-05-22 11:03:04 -05:00
Mike Place
8b45b577a9 Merge pull request #41356 from whiteinge/doc-full_return 
Add full_return to release notes
 2017-05-22 10:56:14 -05:00
Seth House
fa0b1e7d7e Add full_return to release notes 2017-05-21 16:27:40 -06:00
rallytime
c6c1d30c48 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/yumpkg.py
  - salt/spm/__init__.py
  - tests/unit/modules/test_zypper.py
  - tests/unit/utils/test_network.py
 2017-05-20 17:07:34 -06:00
Seth House
f6ae3b4634 Add rest_cherrypy additions to the release notes 2017-05-20 15:59:46 -06:00
Mike Place
6bdb7cca7d Merge pull request #41327 from Ch3LL/add_2016.11.6_release 
Add 2016.11.6 Release Notes
 2017-05-19 13:05:08 -05:00
Mike Place
6ca65592da Merge pull request #41322 from Ch3LL/fix_release_2016.11.5_notes 
Add patched packages warning to 2016.11.5 release notes
 2017-05-18 16:53:25 -05:00
Ch3LL
e5fc0aeb9c
Add 2016.11.6 Release Notes 2017-05-18 14:17:35 -04:00
Ch3LL
9a1bf4205f
fix url refs in rst 2017-05-18 12:42:35 -04:00
Ch3LL
cde008ff77
Add patched packages warning to 2016.11.5 release notes 2017-05-18 12:24:53 -04:00
Ch3LL
520740d862
[2016.13] Bump latest release version to 2016.11.5 2017-05-18 09:40:08 -04:00
Ch3LL
cdb072c207
[2016.11] Bump latest release version to 2016.11.5 2017-05-18 09:39:04 -04:00
Mike Place
051259d469 Merge pull request #41218 from gtmanfred/roster 
allow for syncing salt-ssh rosters on the master
 2017-05-17 14:21:25 -05:00
Evgeny Akhmetkhanov
76104f23b4 Add basic auth for SPM 2017-05-14 15:32:55 +03:00
Erik Johnson
10dc695cc4 Make salt-cp work with larger files 
This breaks the files into chunks to keep them from exceeding the max size
of a published command. It also adds recursion, allowing for entire
directories to be transmitted. Finally, it adds gzip compression, and
a "-n" flag to disable use of compression.
 2017-05-12 15:13:28 -05:00
Daniel Wallace
836ee32ff6 allow for syncing salt-ssh rosters on the master 2017-05-12 13:36:46 -06:00
Mike Place
a0a2646007 Merge pull request #41194 from rallytime/md5-warning-cleanup 
Update fingerprint hash type default from md5 to sha256
 2017-05-12 11:13:18 -05:00
rallytime
bb0f8f32de Update fingerprint hash type default from md5 to sha256 
This PR also removes the warnings that this default with change in
the Nitrogen release, updates the documetation accordingly, and adjusts
some of the affected tests.
 2017-05-11 09:33:45 -06:00
rallytime
12a75c1108 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-10 15:32:23 -06:00
twangboy
24b11ffdc2 Add release notes 2017-05-10 12:27:45 -06:00
Ch3LL
28371aa035
2016.11.5 release notes: add additional commits 2017-05-09 17:02:51 -04:00
rallytime
ef0df4a954 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_network.py
  - salt/modules/win_pkg.py
  - salt/utils/gitfs.py
  - tests/unit/modules/test_win_network.py
  - tests/unit/states/test_file.py
 2017-05-09 14:32:49 -06:00
Nicole Thomas
d2ae7deff2 Merge pull request #41148 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-09 14:23:28 -06:00
Mike Place
2156395b2e Merge pull request #41147 from rallytime/bp-39676 
Back-port #39676 to 2016.11
 2017-05-09 12:40:43 -06:00
Mike Place
6fa41dc89d Merge pull request #41111 from terminalmage/issue41105 
Allow "ssl_verify: False" to work with pygit2
 2017-05-09 11:56:11 -06:00
rallytime
aba35e20dd Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-09 11:14:05 -06:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Daniel Wallace
2370d9316b add user_data to digital ocean 2017-05-08 09:59:27 -06:00
Erik Johnson
f6a16956a0 Add note on lack of support for VSTS in older libssh2 releases. 2017-05-08 07:59:53 -05:00
Daniel Wallace
c038727a80 document clouds dynamic directory 2017-05-07 20:30:20 -06:00
Erik Johnson
8c6410e3cd Add notices about ssl_verify only working in 0.23.2 and newer 2017-05-05 17:04:23 -05:00
Erik Johnson
f73c4b7167 Add http(s) auth config docs for GitPython 2017-05-05 16:56:01 -05:00
rallytime
bb1917243e Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-05 10:11:11 -06:00
Ch3LL
96ed815687
Add 2016.11.5 release notes and change log 2017-05-04 14:16:18 -04:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
Mircea Ulinic
e3c40ea81a Outputters txt ref 2017-05-04 09:33:45 -06:00
Mircea Ulinic
20b307a310 Add New Modules section 2017-05-04 09:33:45 -06:00
Mircea Ulinic
7c8f14977b More NAPALM notes 2017-05-04 09:33:45 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-03 11:13:42 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pip.py
 2017-04-28 09:20:59 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer 
Attempt to connect to public ip address in softlayer
 2017-04-28 05:43:57 -06:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00
Daniel Wallace
d6eb11410f Attempt to connect to public ip address in softlayer 
Unless private_ssh or private_wds is set.

Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address.  It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.

Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
 2017-04-27 12:22:13 -06:00
Erik Johnson
8c078f144c Add additional note about quoting within load_yaml 2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11 Add documentation for PyYAML's loading of time expressions 
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
 2017-04-27 10:59:49 -05:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-25 16:42:11 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby 
Alias moby to docker in Nitrogen (and later)
 2017-04-24 22:37:53 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Ch3LL
889540a313
[2016.3] Bump latest release version to 2016.11.4 2017-04-24 13:27:15 -04:00
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -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
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
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
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -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
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
 2017-04-17 13:32:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-12 11:18:32 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes 
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
 2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes 
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
 2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease 
This is a typo fix
 2017-04-11 11:02:58 -05:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11 
Merge-forward 2016.3 -> 2016.11
 2017-04-07 10:08:19 -05:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00