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
43,317 Commits 24 Branches 182 Tags 341 MiB
7099c02a53
Commit Graph

2044 Commits

Author SHA1 Message Date
Joseph Hall
7099c02a53 Add serial commas to the style guide 2014-12-12 03:30:11 -07:00
Steve Groesz
6cb313533b Fix missing text 
Found missing colon, causing code blocks not to display.  This fixes issue #18879
 2014-12-11 17:29:31 -06:00
Pedro Algarvio
e5dc9f5b28 Merge pull request #18849 from techhat/ec2win 
Copy fixes for Windows Salt Cloud doc
 2014-12-09 19:03:20 +00:00
Joseph Hall
25d8cb6560 Copy fixes for Windows Salt Cloud doc 2014-12-09 11:57:35 -07:00
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
 2014-12-09 10:59:18 -07:00
Thomas S Hatch
ac08c08695 Merge pull request #18815 from techhat/ec2win 
Allow userdata to be passed to EC2
 2014-12-08 15:07:38 -07:00
Joseph Hall
790cd28ff1 Update Windows docs for auto-generated Windows passwords 2014-12-08 14:23:05 -07:00
Thomas S Hatch
7dd99fbd91 Merge pull request #18794 from nmadhok/doc-fixes 
Doc fixes
 2014-12-08 13:22:39 -07:00
Thomas S Hatch
0c6655544c Merge pull request #18782 from rallytime/master_tops_rendering 
Fix markup so master_tops document will render correctly
 2014-12-08 13:21:00 -07:00
Thomas S Hatch
a47aa7be76 Merge pull request #18765 from pass-by-value/api_tokens 
Accept salt token for cherrypy /events
 2014-12-08 13:11:43 -07:00
Nitin Madhok
d2685b8fa2 Fixing sphinx errors 2014-12-08 11:18:12 -05:00
Erik Johnson
00bf5daff8 Add bugfix for #17963 to 2014.7.1 releae notes 2014-12-08 08:45:03 -06:00
JP Viljoen
6f3a1ab7b3 [docs] fix minor typo 2014-12-07 10:24:49 +02:00
rallytime
9e5350c2f4 Fix markup so master_tops document will render correctly 
Fixes #18723
 2014-12-05 20:47:41 -07:00
Aditya Kulkarni
e19550763b Accept salt token for cherrypy /events 2014-12-05 12:15:23 -05:00
Thomas S Hatch
683987e4c3 Merge pull request #18715 from styro/new-windows-deps 
Add some new Windows build dependencies to docs.
 2014-12-04 16:46:02 -07:00
Colton Myers
79e5e80ad1 Add state.single to salt-ssh release notes for lithium 2014-12-04 14:35:52 -07:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Anton D
12a43353e3 Add some new Windows build dependencies to docs. 2014-12-04 23:34:21 +13:00
Thomas S Hatch
e6f843dde1 Merge pull request #18650 from bbeausej/develop 
salt-cloud GCE : Support for addresses & internal IPs
 2014-12-03 20:56:07 -07:00
Rick Holzer
e8df3f5332 Clarification 2014-12-02 16:21:55 -07:00
Benoit Beausejour
680689e78a Updated documentation for GCE: 
- Support for fixed address
  - New salt function for create_address, delete_address, show_address
 2014-12-02 15:38:00 -05:00
Thomas S Hatch
dbcc98e5ba Merge pull request #18610 from rallytime/update_zmq4_docs 
Make ZMQ 4 installation docs for ubuntu more clear
 2014-12-02 10:04:16 -07:00
Daniel Nägele
81164c17e7 document the dependencies for the schedule options 'when' and 'range' 2014-12-02 13:33:50 +01:00
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
Tim O'Guin
39fb372898 fixed allocate_new_eip typo in AWS cloud docs 2014-12-01 14:46:32 -06:00
rallytime
9fe67a34c2 Make ZMQ 4 installation docs for ubuntu more clear 
References #18476
 2014-12-01 11:48:17 -07:00
Erik Johnson
b11542dab9 Update 2014.7.1 release notes 2014-11-28 16:55:49 -06:00
Seth House
75ef72b7fb Merge pull request #18523 from saltstack/revert-18148-six_docs_build 
Revert "[don't merge!!] Add six dependency notice to building docs intru...
 2014-11-26 16:19:42 -07:00
T.J. Yang
a6535cf37d makefile update at Wed Nov 26 16:21:18 CST 2014 2014-11-26 16:21:18 -06:00
Nicole Thomas
e1157d13be Revert "[don't merge!!] Add six dependency notice to building docs intructions" 2014-11-26 12:23:13 -07:00
Colton Myers
397d61b1fc Add lithium release notes 2014-11-25 15:25:46 -07:00
Thomas S Hatch
389aae80b9 Merge pull request #18448 from fabaff/doc-firewall 
add section about fedora 18+ and rhel/centos 7
 2014-11-25 09:34:04 -07:00
Fabian Affolter
d5caef6666 add section about fedora 18+ and rhel/centos 7 2014-11-24 23:56:28 +01:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Erik Johnson
55b80853f6 Add new release notes file for 2014.7.1 2014-11-24 10:36:46 -06:00
Erik Johnson
22962d097e Fix wording in 2014.1.1 release notes 
As this was the first bugfix release for 2014.1.0, it should not be
described as "another" bugfix release.
 2014-11-24 10:35:47 -06:00
Erik Johnson
c0d9b84a86 Add 2014.7.0 to toctree 2014-11-24 09:46:48 -06:00
Pedro Algarvio
0b946ba32b Merge branch '2014.7' into hotfix/merge-forward 2014-11-22 02:17:10 +00:00
rallytime
91538d7ec1 Add information about salt-cloud events to master events doc 2014-11-21 15:57:59 -07:00
Colton Myers
dc43840cee Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/glusterfs.py
	salt/modules/macports.py
	salt/modules/makeconf.py
	salt/modules/mdadm.py
	salt/modules/smartos_vmadm.py
	salt/modules/zypper.py
	salt/utils/event.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/unit/netapi/rest_tornado/test_handlers.py
 2014-11-21 12:05:32 -07:00
Seth House
898f1a70c3 Fix missing space after colon in architecture doc 
Fixes #18134
 2014-11-20 12:30:33 -06:00
Ronan Amicel
3d2b44a14b Fix typo in 2014.7.0 release notes 
virturalenv → virtualenv
 2014-11-20 11:26:01 +01:00
Elias Probst
b0ead3f326 Typo in 2014.7.0 release notes (documentaiton → documentation). 2014-11-19 20:47:18 +01:00
jmdcal
5e2bbe363a fixed confusion 
Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
 2014-11-19 12:32:07 -06:00
Thomas S Hatch
9860f189d4 Merge pull request #18247 from terminalmage/docs 
Add note about libssh2 optdepend for ssh access w/libgit2
 2014-11-19 09:40:52 -07:00
Erik Johnson
d2b3da6bd7 Add note about libssh2 optdepend for ssh access w/libgit2 
See https://github.com/saltstack/salt/issues/15424#issuecomment-63493011
 2014-11-18 22:08:29 -06:00
Colton Myers
c505a2d3ff Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/at.py
	salt/modules/makeconf.py
	salt/modules/pacman.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
 2014-11-18 16:48:47 -07:00
Colton Myers
426c97282e Deprecating for Boron, not Beryllium 2014-11-18 16:39:01 -07:00
Colton Myers
c0f7756153 Reorganize orchestration doc and deprecate overstate runner 2014-11-18 16:31:36 -07:00