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
76,221 Commits 24 Branches 182 Tags 341 MiB
0eab0ee8a6
Commit Graph

4003 Commits

Author SHA1 Message Date
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/2016.11.0.rst
 2016-12-01 12:14:33 -07:00
Dmitry Kuzmenko
e51448f5ed Added Carbon release notes. Fixed sphinx errors in the file. (#38022) 2016-12-01 09:59:15 -07:00
Nicole Thomas
6f34332e87 Adjust code examples to use the actual bootstrap-salt.sh file name (#38011) 2016-12-01 09:01:25 -07:00
Mike Place
8f351644b5 Merge pull request #37960 from rallytime/proxy-grains-merge-switch 
Switch proxy_merge_grains_in_module option default from False to True
 2016-11-30 09:00:56 -07:00
Nicole Thomas
186b3c7959 Fix RST link format (#37958) (#37970) 2016-11-29 14:34:07 -07:00
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-29 13:52:38 -07:00
Mircea Ulinic
3cda665640 Fix RST link format (#37958) 2016-11-29 13:24:14 -07:00
rallytime
62e3c44045 Switch proxy_merge_grains_in_module option default from False to True 2016-11-29 10:51:46 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00
Mircea Ulinic
529b64dbeb
Inclued NAPALM in 2016.11 release notes 2016-11-29 13:46:45 +00:00
Nicole Thomas
8f986b28dc Remove release candidate doc ref from 2016.11.0 release notes (#37931) 2016-11-28 13:49:28 -07:00
Nicole Thomas
0f8b187d15 Merge pull request #37923 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-28 12:55:03 -07:00
Thomas S Hatch
14271156f6 Add a release notes reference to the docker-sls tutorial (#37927) 2016-11-28 12:54:17 -07:00
rallytime
dfedd1185a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/ddns.py
  - salt/templates/rh_ip/network.jinja
 2016-11-28 11:08:19 -07:00
Erik Johnson
efb4dc1001 Add states to manage systemd masking 
This also changes how the systemd module handles masking, to accommodate
the fact that both indefinite and runtime masks can be set
simultaneously for the same service.
 2016-11-27 01:06:33 -06:00
Benjamin Drung
9a51ba5c5b Fix various spelling mistakes 2016-11-24 16:00:31 +01:00
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871) 
Found using

find . -name '*.rst' | xargs igor -R -r
 2016-11-23 14:53:17 -07:00
rallytime
b1745b8ff9 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-22 08:57:23 -07:00
rallytime
3d6d32edc5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2016-11-21 17:29:07 -07:00
Nicole Thomas
0e74bad284 Update branch refs to more relevant branch (#37826) 
And cleanup some :ref: links that are rendering incorrectly
 2016-11-21 16:41:02 -07:00
Nicole Thomas
c300863159 Add some dependency documentation to libvirt docs (#37820) 
Fixes #5999
 2016-11-21 15:15:20 -07:00
Nicole Thomas
4910912ffa Update orchestrate runner file.copy doc example (#37817) 
The kwarg arguments should be a dictionary, and not a list.

Fixes #37383
 2016-11-21 13:23:08 -07:00
Adrian Todorov
ca3b6e7874 Update proxmox.rst with more options and LXC 2016-11-21 10:26:59 -07:00
Adrian Todorov
e04f63d721 Update proxmox.rst with more options and LXC (#37790) 2016-11-21 09:22:47 -07:00
rallytime
5f4a73f880 Merge branch '2016.11' into 'develop' 
No conflicts.
 2016-11-16 08:55:22 -07:00
Erik Johnson
62f998d013 Update RST and release notes for Carbon release (#37715) 
Since v2016.11.0rc2 will not become v2016.11.0, the docs needed to be
updated regarding a bugfix that was originally slated for 2016.11.1
since it came after RC2 was cut.
 2016-11-15 16:51:31 -07:00
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
rallytime
0e332ab591 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/cli/batch.py
  - salt/cli/salt.py
  - salt/transport/client.py
  - salt/utils/vmware.py
  - tests/integration/modules/sysmod.py
 2016-11-14 09:14:00 -07:00
Oz N Tiram
1ac9b96a76 Update grains documentation 
Make it clear that changes to grains content require
 a refersh of modules.
 2016-11-12 10:45:39 +01:00
Mike Place
a97c2ad34b Merge pull request #37640 from rallytime/update-release-notes 
Add known issue #37541 to 2016.3.4 release notes
 2016-11-12 09:28:12 +13:00
Nicole Thomas
f7f7b987b3 Merge pull request #37619 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-11 11:44:09 -07:00
rallytime
6d6de12aff Grammatical fix 2016-11-11 11:03:57 -07:00
C. R. Oldham
1ca5b958c6 Forward-port change from 2015.8 adding release note for rotate_aes_key 2016-11-11 10:36:47 -07:00
rallytime
24d7f20e16 Add known issue #37541 to 2016.3.4 release notes 
Refs #37541
 2016-11-11 09:46:28 -07:00
Eric Radman
9a60e298bb vmware: optionally allow network interface MAC to be set 
Example profile:

    network:
      Network Adapter 1:
        mac: '00:16:3e:e8:19:0f'
        name: vlan25
        switch_type: standard

This takes effect as soon as the VM is initialized, so PXE-booting can
take advantage of this.
 2016-11-10 19:59:55 -05:00
rallytime
4c245a3fa5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/x509.py
 2016-11-10 16:51:52 -07:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
Nicole Thomas
8ba9ceda50 Merge pull request #37609 from rallytime/merge-2016.11 
[2016.11] Merge forward from carbon to 2016.11
 2016-11-10 15:48:43 -07:00
Nicole Thomas
06786f9617 Remove the v from the tag reference (#37595) 
When installing with pip, we just need the package version. No `v`.
 2016-11-10 09:41:34 -07:00
Aditya Kulkarni
a7e09f9260 Use existing VM's VDD size if not specified in the cloud profile (#37579) 2016-11-10 09:41:11 -07:00
Clint Armstrong
928462df1d fix example of function argument limiting (#37584) 2016-11-09 13:37:18 -07:00
rallytime
f44e14b63c Merge branch 'carbon' into '2016.11' 
Conflicts:
  - salt/modules/file.py
 2016-11-09 12:56:58 -07:00
Nicole Thomas
7036707fbf Back-port #37569 and #37581 to 2016.11 (#37585) 
* Remove known issues section for rc2

All of these have been fixed in the latest rc

* Add smartOS RC build instructions back to RC docs

And update the links to the new packages
 2016-11-09 10:39:07 -07:00
Nicole Thomas
b24992ea38 Update release candidate docs with RC2 info (#37568) 2016-11-09 10:19:11 -07:00
Nicole Thomas
2c6a8748fe Add smartOS RC build instructions back to RC docs (#37581) 
And update the links to the new packages
 2016-11-09 10:09:03 -07:00
Nicole Thomas
19dcace679 Remove known issues section for rc2 (#37569) 
All of these have been fixed in the latest rc
 2016-11-08 16:46:01 -07:00
Nicole Thomas
0564532924 Update release candidate docs with RC2 info (#37564) 2016-11-08 15:26:37 -07:00
rallytime
5ead1425d7 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/win_servermanager.py
 2016-11-08 13:04:33 -07:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
Mike Place
8b0f280998 Merge pull request #37509 from Rumbles/rumbles 
Saltstack PPA is no longer maintained - update docs
 2016-11-08 13:27:14 +13:00