rallytime
e91fcbeaac
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/dockerng.py
- salt/thorium/key.py
2017-01-26 16:02:06 -07:00
Thomas S Hatch
0b4aca9145
fix some minor typos in the thorium docs
2017-01-24 10:05:23 -07:00
Da-Juan
c3ec3df5f0
Fix typo in stanza name
...
Fix statreg stanza name to match the require statement and the docs in
salt/thorium/key.py
2016-12-07 14:23:03 +01:00
rallytime
f2fc207d4f
Update Carbon versionadded tags to 2016.11.0 in thorium files
2016-10-27 10:11:58 -06:00
Joseph Hall
2a77316123
Update usage docs for Thorium ( #36368 )
2016-09-16 09:52:47 -06:00
Thomas S Hatch
c6882ca974
suggest a sane default interval
2016-06-30 09:45:17 -06:00
Thomas S Hatch
29b6253b3e
Add all the things I always forget :)
2016-06-29 09:47:34 -06:00
Thomas S Hatch
d4d79d95ea
update docs to a workign example
2016-06-28 21:19:52 -06:00
Thomas S Hatch
22c6895d63
Thormods ( #32600 )
...
* add basic runner caller to thorium
* add basic wheel module
* only start the reactor if it is configured and add it correctly to the engines
* fix lint and a syntax error I forget to get into the PR
* add break to speed things up a bit
* bah! whitespace!
2016-04-15 12:07:05 -06:00
Thomas S Hatch
829f1b0d58
Fix rendering error with thorium docs
2016-04-12 13:58:12 -06:00
rallytime
308aa5fd61
Merge branch '2016.3' into 'develop'
...
Conflicts:
- conf/master
- conf/minion
- doc/ref/proxy/all/index.rst
- salt/cli/daemons.py
- salt/modules/key.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/utils/__init__.py
- salt/utils/cloud.py
- tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
Jacob Hammons
fd7f7bcddf
Updated release notes
...
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
2016-03-14 16:34:22 -06:00
rallytime
cc29092dcb
Merge branch '2016.3' into 'develop'
2016-02-18 11:33:24 -07:00
Thomas S Hatch
2ef3918366
Add provisional statement to Thorium
2016-02-18 10:47:10 -07:00
rallytime
73d73e80c1
Merge branch '2016.3' into 'develop'
...
Conflicts:
- doc/topics/releases/2015.8.4.rst
- doc/topics/releases/2015.8.5.rst
- doc/topics/thorium/index.rst
- salt/cloud/clouds/opennebula.py
- salt/engines/thorium.py
- salt/loader.py
- salt/modules/archive.py
- salt/modules/boto_vpc.py
- salt/modules/data.py
- salt/modules/reg.py
- salt/pillar/mysql.py
- salt/runners/cache.py
- salt/states/archive.py
- salt/states/cron.py
- salt/states/file.py
- salt/states/glance.py
- salt/states/reg.py
- salt/thorium/__init__.py
- salt/thorium/check.py
- salt/thorium/file.py
- salt/thorium/reg.py
- salt/utils/jid.py
- salt/utils/parsers.py
- setup.py
2016-02-12 14:38:50 -07:00
Thomas S Hatch
715d3e274f
clarify that this is not final for this release
2016-02-03 21:20:25 -07:00
Thomas S Hatch
5e5ced1c66
add initial thorium docs
2016-02-03 18:34:17 -07:00
Thomas S Hatch
4ed5ba08b2
add initial thorium docs
2016-02-02 13:03:30 -07:00
