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
75,559 Commits 24 Branches 182 Tags 341 MiB
2e68da3e52
Commit Graph

6555 Commits

Author SHA1 Message Date
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
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
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
Nicole Thomas
a330866a17 [develop] Doc version updated to 2016.3.4 (#37484) 2016-11-04 14:13:34 -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
Mike Place
038ad04c4c Merge pull request #37376 from gtmanfred/roster 
add default roster options to the master config
 2016-11-03 12:06:23 +13:00
rallytime
c31f879f8b Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vmware.py
 2016-11-02 11:33:21 -06:00
Daniel Wallace
fd4df1be52 add documentation about roster_defaults 2016-11-02 09:29:03 -05:00
Mircea Ulinic
877ed8f1d5
Small typos 2016-11-02 12:01:19 +00:00
Mircea Ulinic
78cf63d0ef
Doc for the napalm snmp mod 2016-11-02 12:01:15 +00:00
Oz N Tiram
c03a184212 Make it clear that grains can exist in one place in only 2016-11-02 10:03:15 +01:00
Mike Place
9446e48da0 Merge pull request #37350 from pass-by-value/full_and_linked_clone_v1 
Add handling for full and linked clone
 2016-11-02 21:02:29 +13:00
Mike Place
d0f33ab6b2 Merge pull request #37377 from cloudflare/NAPALM-ROUTE-MODULE 
Napalm route module
 2016-11-02 19:45:52 +13:00
Mike Place
38dd7ed3ca Merge pull request #37382 from rallytime/fix-36210 
Update solarisips.list_upgrades refresh default to True
 2016-11-02 19:36:54 +13:00
Erik Johnson
3014afd517 Overhaul archive.extracted state 
This fixes a number of annoyances with the archive.extracted state.
Rather than re-state the changes again here, they can be observed in the
carbon release notes, where they have been documented.
 2016-11-01 19:35:57 -05:00
Ethan Devenport
21e24a8125 Cloud API v3 updates including: 
* Added server availability zone parameter.
* Added volume availability zone parameters.
* Added NAT parameter for private NIC.
* Updated documentation.
 2016-11-01 21:37:53 +00:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
rallytime
3feb063413 Add kwarg default change to nitrogen release notes 2016-11-01 10:08:33 -06:00
Thomas S Hatch
45f365e14f Merge pull request #37357 from rallytime/update-version-refs 
Update remaining Carbon references to 2016.11.0
 2016-11-01 09:07:05 -06:00
Mircea Ulinic
13086c580b
Doc for napalm_route 2016-11-01 14:56:23 +00:00
Mircea Ulinic
626790f7da
Include doc 2016-11-01 13:40:59 +00:00
Nicole Thomas
5328bc8d99 Update man pages for 2016.11 (#37354) 2016-10-31 13:09:01 -06:00
rallytime
6332da5c44 Prep release notes for 2016.11 2016-10-31 13:05:24 -06:00
rallytime
d4364d284a Officially update version.py for carbon to be 2016.11.0 2016-10-31 11:46:00 -06:00
Aditya Kulkarni
d8b1c9c777 Add handling for full and linked clone 
and commit disk mode additions
 2016-10-31 12:30:49 -04:00
rallytime
e10058c831 Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-31 10:15:25 -06:00
Mike Place
a3b5109051 Merge pull request #37328 from gravyboat/bugfix/master_doc_format 
Fix up some formatting issues
 2016-10-31 18:50:15 +13:00
Benedikt Werner
b641d75235 Added suse_apache and sensehat to doc index and fixed doc formating 2016-10-30 20:41:37 +01:00
Forrest Alvarez
cf3f28c382 Fix up some formatting issues 2016-10-30 00:42:59 -07:00
rallytime
39459ed30b Document the existence of placementgroup option in ec2 driver 2016-10-28 12:51:46 -06:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-28 09:25:00 -06:00
Nicole Thomas
7d79ea7844 Update 2016.3.4 release notes (#37285) 2016-10-27 16:07:56 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Justin Findlay
a2eae208c5 update 2016.3.4 release notes (#37278) 2016-10-27 10:18:18 -06:00
rallytime
f2fc207d4f Update Carbon versionadded tags to 2016.11.0 in thorium files 2016-10-27 10:11:58 -06:00
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
rallytime
190ec32283 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/cloud/vmware.rst
  - salt/cloud/clouds/vmware.py
 2016-10-26 10:09:26 -06:00
Mike Place
afd3dc3807
Merge branch '2016.3' into 2016_3_carbon 2016-10-26 14:08:03 +09:00