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
43,284 Commits 24 Branches 182 Tags 341 MiB
70fb8e9055
Commit Graph

3791 Commits

Author SHA1 Message Date
Thomas Jackson
3859204103 Fix typo in renderers doc, the directory name was wrong 2014-12-10 18:42:16 -08:00
Thomas S Hatch
bcb529f809 Merge pull request #18823 from scalp42/typos 
Correct some typos
 2014-12-09 14:43:15 -07: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
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08: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
Nitin Madhok
c299f4119a Adding pillar to toctree 2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -05:00
Nitin Madhok
67fd828708 Adding modules to toctree 2014-12-08 10:34:33 -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
8a7134e72d Merge pull request #18672 from whiteinge/mod_aggregate-state-level 
Add docs for mod_aggregate state-level keywords
 2014-12-03 21:12:10 -07: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
Thomas S Hatch
1bfed11756 Merge pull request #18541 from cachedout/event_return 
Event return
 2014-12-03 09:56:33 -07:00
Seth House
54d8760d2d Added docs for the state-level aggregate keyword 
Also added clarification on the two ways to invoke the aggregation
function.
 2014-12-02 18:33:10 -05: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
abc6859e09 Merge pull request #18622 from Supermathie/develop 
alternative way of restarting windows minion
 2014-12-02 10:05:16 -07: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
Michael Brown
9b39eae40c alternative way of restarting windows minion 2014-12-01 16:51:58 -05: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
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Erik Johnson
b11542dab9 Update 2014.7.1 release notes 2014-11-28 16:55:49 -06:00
T.J. Yang
3f1a007318 shifting chapters in contents 1-3 rst files 2014-11-27 04:15:38 -06:00
T.J. Yang
f024e34e3a without this patch,salt-[1-3].pdf content are wrong 2014-11-27 03:50:17 -06:00
Mike Place
8297c2c48e Documentation 2014-11-26 16:56:45 -07: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
Pedro Algarvio
f5794f837c Update 'doc/.tx/config' - Build #213 
http://cookingwithsalt.org/job/salt/job/transifex/213/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-11-26 20:01:25 +00:00
Nicole Thomas
e1157d13be Revert "[don't merge!!] Add six dependency notice to building docs intructions" 2014-11-26 12:23:13 -07:00
Thomas S Hatch
2e3089410a Merge pull request #18514 from cachedout/issue_16879 
Update docs for unless
 2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07:00
Colton Myers
397d61b1fc Add lithium release notes 2014-11-25 15:25:46 -07:00
rallytime
73f3c0091d Clean up doc build so it doesn't stacktrace 
Fixes #18471

- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
 2014-11-25 15:11:15 -07:00