valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,812 Commits 24 Branches 182 Tags 341 MiB
1aa23c7a53
Commit Graph

6590 Commits

Author SHA1 Message Date
rallytime
1b5f89577e Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-14 09:19:49 -07:00
Mike Place
b049ad6ead Merge pull request #37658 from sjorge/develop-zoneadm 
Want a zoneadm module
 2016-11-12 20:32:05 +00: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
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
5340edb9bb Keep the 'develop' branch setting in doc conf 2016-11-11 09:04:12 -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
eea781a9ac Update the docbuild settings for 2016.11 branch (#37606) 2016-11-10 10:47:25 -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
Mike Place
6d2b2e1881 Slight grammar fix 2016-11-08 13:27:06 +13:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
2e68da3e52 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-11-07 08:22:17 -07:00
rallytime
eae3b9e30f Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-07 08:15:42 -07:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/event/master_events.rst
 2016-11-07 08:13:57 -07:00
James Stocker
83f01a2e5f Saltstack PPA is no longer maintained 2016-11-07 12:07:53 +00:00
Mike Place
2758e74785
Clarify docs on salt-key events 
Closes #37448
 2016-11-07 13:03:40 +13:00
Erik Johnson
c08038d9ea Update 2016.3.5 release notes with source_hash_name explanation 2016-11-06 11:53:41 -06:00
Mike Place
706befd8ca Merge pull request #37476 from pakdel/ec2_cloud_driver_fix 
EC2 support for SubnetName and securityGroupName
 2016-11-06 14:43:09 +13:00
Super-User
2684319213 introduce zoneadm module, implements list 2016-11-05 13:19:36 +01:00
Nicole Thomas
029d822d92 Merge pull request #37480 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2016-11-04 15:27:20 -06:00
rallytime
9b3e4414c8 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - pkg/windows/modules/get-settings.psm1
  - salt/modules/mac_power.py
  - salt/modules/win_dsc.py
  - salt/modules/win_servermanager.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/gitfs.py
 2016-11-04 15:23:49 -06:00
twangboy
9e0631a1ae Add docs denoting the requirement for at least PowerShell 3 2016-11-04 14:04:43 -07:00
Nicole Thomas
8aa101a99c Get release notes started for 2016.3.5 (#37485) 2016-11-04 14:22:26 -06:00
Nicole Thomas
a330866a17 [develop] Doc version updated to 2016.3.4 (#37484) 2016-11-04 14:13:34 -06:00
Nicole Thomas
dfd94959b6 [2016.3] Doc version updated to 2016.3.4 (#37483) 2016-11-04 14:12:19 -06:00
rallytime
ce4b82fdee Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/archive.py
  - salt/modules/status.py
  - salt/states/file.py
  - tests/unit/modules/status_test.py
 2016-11-04 13:51:46 -06:00
rallytime
4132929832 Merge branch 'carbon' into '2016.11' 
No conflicts.
 2016-11-04 13:38:34 -06:00
Amir Pakdel
783f58bf3d EC2 support for SubnetName and securityGroupName 
Now we can have subnetname and securitygroupname
in network_interfaces of EC2 cloud profiles:
profile_name:
  size: t2.medium
  network_interfaces:
  - DeviceIndex: 0
    allocate_new_eip: true
    subnetname: subnet01
    securitygroupname:
    - sgLinux
    - sgServer1
    - sgServer2
 2016-11-04 14:16:02 -04:00
Mike Place
d86ec7372f Merge pull request #37374 from cloudflare/NAPALM-USERS-MODULE 
New execution module: napalm_users
 2016-11-04 18:00:46 +13:00
Mike Place
c98f2eed8b Merge pull request #37434 from cloudflare/NAPALM-USERS-STATE 
New state module: netusers
 2016-11-04 17:20:09 +13:00
Mike Place
d5792b78f7 Merge pull request #37460 from gtmanfred/docs 
remove swig and m2crypto from hacking.rst
 2016-11-04 16:20:59 +13:00
Daniel Wallace
2b133474e5 remove swig and m2crypto from hacking.rst 2016-11-03 19:33:50 -05:00
Mircea Ulinic
8e087c9596
napalm_users doc 2016-11-03 11:23:41 +00:00
Mircea Ulinic
0590c9142f
Doc for exec mod napalm_users 2016-11-03 10:35:37 +00:00
Mike Place
107fd322a6 Merge pull request #37373 from cloudflare/NAPALM-SNMP-STATE 
Napalm snmp state
 2016-11-03 12:13:33 +13:00
Mike Place
1f5daa15a6 Merge pull request #37372 from cloudflare/NAPALM-SNMP-MODULE 
Napalm snmp execution module
 2016-11-03 12:12:04 +13:00