valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
46,225 Commits 24 Branches 182 Tags 341 MiB
5130c31b64
Commit Graph

178 Commits

Author SHA1 Message Date
Colton Myers
f609366dee Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
 2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973 Release 2014.7.1 (docs sidebar and release date for release notes) 2015-01-22 16:52:21 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
 2014-12-23 10:57:26 -07:00
Seth House
d2e9378084 Switch html_title to empty string instead of None 2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url: 
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
 2014-12-19 14:34:57 -07:00
Seth House
f345188d06 Set minimum Sphinx version to 1.3 2014-12-19 14:34:57 -07:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
T.J. Yang
a6535cf37d makefile update at Wed Nov 26 16:21:18 CST 2014 2014-11-26 16:21:18 -06: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
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
Colton Myers
c5dbb60403 Release 2014.7.0 2014-11-19 11:36:21 -07:00
Pedro Algarvio
8fda8badbb Revert "Add six to list of mocked modules" 
This reverts commit 6ebf0fd3aa.

We need six installed in order for the docs to build. Six is too magical
to be mocked, at last, for now.
 2014-11-17 16:45:46 +00:00
rallytime
6ebf0fd3aa Add six to list of mocked modules 2014-11-14 11:35:24 -07:00
Henrik Holmboe
0e772aefe7 Update conf.py as well 2014-10-24 16:27:37 -06:00
Henrik Holmboe
6a6fc4de6e Update conf.py as well 2014-10-22 17:10:18 +02:00
Colton Myers
8133d7d5c6 Update to 2014.1.11 in docs sidebar 2014-10-07 15:08:32 -06:00
Pedro Algarvio
75bafbd6db Allow the docs to build by faking libcloud's __version__ attribute. 2014-09-17 20:03:48 +01:00
Seth House
978931c470 Added salt-unity manpages 
Closes #13937
 2014-09-13 12:56:25 -06:00
Colton Myers
24c13abc4e Bump doc version 2014-08-14 17:33:04 -06:00
Thomas S Hatch
dd7cc0dcbb Merge pull request #14215 from whiteinge/doc-fix-mailing-list-links 
Fix bad global rST links for the mailing lists
 2014-07-14 17:14:15 -06:00
Thomas S Hatch
1962ad682f Merge pull request #14036 from basepi/2014.1.6docsupdate 
Update docs to 2014.1.7 release
 2014-07-14 15:49:43 -06:00
Khris Richardson
568daa16f6 per excellent suggestion by whiteinge 2014-07-14 16:18:52 -05:00
Seth House
39a0b4dfc3 Fix bad global rST links for the mailing lists 2014-07-14 15:04:50 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Colton Myers
d11bcd60d3 Update docs to 2014.1.7 release 2014-07-09 14:58:56 -06:00
Colton Myers
5de50f13ce Update docs to 2014.1.6 release 2014-07-08 15:33:07 -06:00
Seth House
ddc4353248 Added central links for the various mailing lists 2014-07-03 20:32:26 -06:00
Seth House
acb203c735 Added salt-api to CLI TOC 2014-06-20 10:20:58 -06:00
Seth House
cbc3775fbc Remove the sphinxcontrib from the import path 
I swear I fixed this during the merge. Must have undone the change
somehow.
 2014-06-19 12:27:31 -06:00
Seth House
295e0b9060 Temporarily commented out docs Mock decorator conditional 
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
 2014-06-18 23:20:27 -06:00
Seth House
8df1bbf1d1 Added missing functools import 2014-06-18 23:05:26 -06:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
d01462cb28 Retain docstring if mocked object is used as a decorator 
This prevents mocked objects that are used as decorators from obscuring
the docstring of the decorated function/method.
 2014-06-18 15:28:20 -06:00
Seth House
de3e1d31ce Removed mocks for unused libraries 
These mocks were all for legacy code.
 2014-06-18 15:28:20 -06:00
Seth House
13e89c6ac6 Merge pull request #158 from pass-by-value/websocket_tornado 
Websocket tornado
 2014-06-17 21:07:28 -06:00
Colton Myers
51aefc9389 Add release notes for 2014.1.5 and bump docs version 2014-06-11 12:03:31 -06:00
Pedro Algarvio
506cbe4726 Make use of the bootstrap.saltstack.com URL(s) 2014-06-07 13:59:39 +01:00
Aditya Kulkarni
02d5c00358 Add docs 2014-06-05 10:12:00 -04:00
Seth House
63dc40bd06 Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX 
We have a few unicode chars in the docs now. Plus this should be a good
change for future non-English builds of the docs.
 2014-06-04 17:44:10 -06:00
Aditya Kulkarni
64ed4a309b Add websocket support 2014-06-03 15:04:23 -04:00
Colton Myers
db271990d2 Update docs version to 2014.1.4 2014-05-05 10:49:37 -06:00
Chris Rebert
45981a56f9 lots of copyediting 2014-04-30 12:06:27 -07:00
Seth House
7c952dd98e Moved SaltStack events and news to SaltStack-specific sidebar template 2014-04-29 17:57:27 -06:00
Seth House
04021cb233 Moved quick search to the top of the sidebar 2014-04-29 17:57:27 -06:00
Seth House
c3d4816275 Moved Salt version infos to its own sidebar template 2014-04-29 17:57:27 -06:00
Seth House
cf0b79322e Changed env var that denotes if we're building for docs.saltstack.com 
This one is a bit more descriptive.
 2014-04-29 17:57:27 -06:00
Pedro Algarvio
23b12283fb Update the bootstrap script tutorial doc to latest from the project. 
Also ignore the bootstrap script HTTPS URL.
 2014-04-27 11:48:17 +01:00
Pedro Algarvio
a1d446d1e5 Revert "Default to https instead of http" 
This reverts commit 6fc260be9e.
 2014-04-27 11:46:36 +01:00
Daniel Wallace
6fc260be9e Default to https instead of http 
For everything that doesn't use python urllib
 2014-04-26 20:20:32 -05:00
Thomas S Hatch
39afc8f067 Merge pull request #12046 from basepi/2014.1.3releasenotes 
Add 2014.1.3 release notes
 2014-04-22 09:47:10 -06:00