valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,805 Commits 24 Branches 182 Tags 341 MiB
c567f50da7
Commit Graph

7201 Commits

Author SHA1 Message Date
Raine Curtis
87035e0651 new Xen cloud driver 2017-04-12 14:52:07 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-04-11 15:11:46 -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
Mike Place
b2870cd4c2 Merge pull request #40613 from Venafi/develop 
Updated documentation for Venafi module with better examples & clarif…
 2017-04-11 08:48:35 -06:00
Mike Place
4d24fc2666 Merge pull request #40617 from rallytime/oxygen-release-notes 
Start release notes file for Oxygen
 2017-04-11 08:47:39 -06:00
rallytime
5acaee2d5d Start release notes for Oxygen 2017-04-10 16:44:58 -06:00
Mike Place
523918c4a8 Merge pull request #40599 from sjorge/logadm-state 
Logadm state
 2017-04-10 16:35:57 -06:00
Mike Place
c56247c105 Merge pull request #40608 from pcn/patch-1 
Fix confusing typo in thorium start page
 2017-04-10 16:24:48 -06:00
wgoulet
bbac469cdb Updated documentation for Venafi module with better examples & clarifications 2017-04-10 15:41:24 -05: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
Nicole Thomas
93818257cb Merge pull request #40591 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-10 12:07:16 -06:00
Peter N
df9b061a33 Fix confusing typo in thorium start page 
The thorium auto deregistration example has a slightly confusing typo.  From my read of the docs it should `s/startreg/statreg` so I'm submitting this PR to make that effective.
 2017-04-10 10:54:26 -04:00
Super-User
cf2898fbdb generate docs for salt.states.logadm 2017-04-09 15:44:18 +02:00
rallytime
4a75675d07 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
 2017-04-07 11:20:51 -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
Mike Place
fa2c8f852a Merge pull request #40557 from isbm/isbm-aws-doc-fix 
Fix the documentation for AWS
 2017-04-06 12:25:54 -06: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
Bo Maryniuk
99b7996ce6 Fix the documentation for AWS 2017-04-06 15:02:17 +02: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
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer 
salt-cloud: Do not pass userdata_file through yaml renderer
 2017-04-05 11:32:06 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3 
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
 2017-04-05 10:58:32 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd 
Update release information for 2016.11.4 for additional AIX support
 2017-04-05 10:20:22 -06:00
Pedro Algarvio
c98920c5fb Merge pull request #40535 from tonybaloney/doc_fix 
Update hacking.rst
 2017-04-05 09:34:39 +01:00
Anthony Shaw
97044bd998 Update hacking.rst 
this one is wrong too
 2017-04-05 15:12:08 +10:00
Anthony Shaw
25ec20ebb0 Update hacking.rst 
Small error in the instructions
 2017-04-05 15:08:40 +10:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
David Murphy
fd93caf206 Added further support for functionality on AIX for 2016.11.4 2017-04-04 13:57:37 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
David Murphy
17b58917f2 Update release information for new AIX support 2017-04-04 13:51:14 -06:00
Mike Place
fe9bc95b26 Merge pull request #40513 from terminalmage/fileserver-design-docs 
Add initial developer docs on the fileserver and client
 2017-04-04 13:37:35 -06:00
Erik Johnson
906d02f395 Add a section on updating the fileserver 2017-04-04 13:06:45 -05:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
rallytime
8e480fffb5 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/runners/saltutil.py
 2017-04-04 11:15:41 -06:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins. 
The adapted config mixin get config methods are not static methods
 2017-04-04 17:29:34 +01:00
Erik Johnson
4e3a2d066a Add a section on the cp module 2017-04-04 10:00:52 -05:00
Denis Fondras
a58e320f41 Set True instead of 1 2017-04-04 14:50:03 +02:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
6329d3580a Add initial developer docs on the fileserver and client 
This may be expanded, but this gives a brief overview.
 2017-04-03 23:56:08 -05:00
Mike Place
30f2593408 Merge pull request #40478 from cloudflare/add-new-funs 
Add new functions to the net module
 2017-04-03 16:31:24 -06:00
Mike Place
f6803bbd6c Merge pull request #40475 from cloudflare/yang-state 
New state module: NAPALM YANG
 2017-04-03 16:30:54 -06:00