dsumsky
6d797f50d4
- log_level_logfile and log_level configuration options inheritance docu updated
2015-02-12 19:47:59 +01:00
rallytime
3c2dd7d801
Change the releasecnadidates doc to reflect 2015.2.0rc1
2015-02-11 12:30:16 -07:00
rallytime
a42a5fb6d5
Add release candidate notification to docs sidebar
...
v2015.2.0rc1
2015-02-11 12:17:29 -07:00
jfindlay
a572be2ca3
Merge pull request #20594 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-11 11:40:15 -07:00
Colton Myers
1e5bd7e1b8
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/fileserver/gitfs.py
salt/loader.py
salt/renderers/pyobjects.py
salt/utils/args.py
salt/utils/decorators/__init__.py
salt/utils/lazy.py
tests/integration/loader/globals.py
tests/integration/loader/loader.py
2015-02-11 09:17:35 -07:00
Dennis Hall
5cf8e389d4
Change Adjective in Starting States Tutorial
...
The line which compares the previous two examples to the following YAML
example should use a demonstrative adjective like 'these'.
2015-02-11 10:44:46 +01:00
toppur
cdbaff63b7
Update formulas.rst
...
There's not keyword named 'base' here, should be 'default'.
2015-02-09 18:24:11 -08:00
Colton Myers
eba17606b4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48
Add file-locking bugfix to 2014.7.2 release notes
2015-02-09 11:32:20 -06:00
Arnold Bechtoldt
88dea95c6c
add some cosmetic changes to the state requisites article
2015-02-07 18:46:03 +01:00
Seth House
60b960c33e
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-02-06 19:53:04 -07:00
Seth House
9a1a2db3aa
Merge remote-tracking branch 'upstream/2014.7' into 2015.2
2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e
Remove Mako from mocked deps for docs build
...
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.
Closes #9571 (at long last).
2015-02-06 19:00:35 -07:00
Colton Myers
244c916b10
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/cron.py
salt/states/npm.py
2015-02-06 15:41:21 -07:00
Colton Myers
56520f4ac9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/minion
salt/modules/cron.py
salt/modules/pip.py
salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Seth House
15936658ba
Added cross-references to other ways to preseed minion keys
2015-02-05 19:15:46 -07:00
Justin Findlay
a44368001b
fix pip venv regression, deprecate activate param
...
Fixes #20191 . If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv. Also
update associated unit test.
2015-02-05 12:36:42 -07:00
David Cournapeau
6847e054d8
DOC: add certifi to get proper https support.
2015-02-04 09:59:22 +00:00
Justin Findlay
b87615e277
document lowercase removal change
2015-02-03 16:27:41 -07:00
Nicole Thomas
9937702767
Merge pull request #20338 from pakdel/mssql
...
MS SQL Execution module
2015-02-03 14:03:31 -07:00
Amir Pakdel
eabb8a262c
Added MS SQL execution module
2015-02-03 10:02:09 -05:00
Thomas S Hatch
e742d995ea
Merge pull request #20332 from westurner/patch-2
...
DOC: topics/tutorials/walkthrough.rst: then > than
2015-02-03 06:20:10 -07:00
Thomas S Hatch
c192b365f5
Merge pull request #20313 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-02-03 05:55:49 -07:00
Wes Turner
203f5c3798
DOC: topics/tutorials/walkthrough.rst: then > than
2015-02-03 05:42:50 -06:00
Colton Myers
068a23e390
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/daemons/flo/core.py
salt/fileclient.py
salt/utils/cloud.py
salt/utils/schedule.py
2015-02-02 15:27:43 -07:00
Diego Woitasen
e6f64019a8
How to store Minion config options on Pillars.
2015-02-02 09:27:13 -03:00
Colton Myers
ca6ecc0f0f
Add only_upgrade to 2015.2 release notes
2015-01-30 16:07:39 -07:00
rallytime
9898fcf613
Merge branch '2015.2' into 'develop'
...
Conflicts:
.gitignore
.pylintrc
.testing.pylintrc
salt/client/mixins.py
salt/cloud/clouds/msazure.py
salt/config.py
salt/modules/mount.py
salt/runners/doc.py
salt/utils/event.py
salt/utils/reactor.py
2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Joseph Hall
f5e8b4a10e
Don't default CA bundle updates to a non-standard location
2015-01-28 20:09:13 -07:00
Thomas S Hatch
97285aadd0
Merge pull request #20152 from techhat/httpupdate
...
Add function to update CA cert bundle
2015-01-28 15:03:55 -07:00
Joseph Hall
f846925ba7
Document text_out and headers_out
2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe
Document updating CA bundles
2015-01-28 10:51:04 -07:00
Seth House
e3d29bf8ff
Fixed syntax error in log_granular_levels example
2015-01-27 20:14:53 -07:00
rallytime
dc23823897
Merge branch '2014.7' into '2015.2'
...
Conflicts:
salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
80bfa4a2a6
Add beacons section to 2015.2.0 release notes
2015-01-26 20:26:51 -07:00
Colton Myers
c4da7bdd64
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/mixins.py
salt/daemons/flo/__init__.py
2015-01-26 19:44:59 -07:00
Seth House
8e476bc455
Fixed typos in the beacon docs
2015-01-26 18:20:54 -07:00
Seth House
b777d3cba1
Added unique identifier for the beacon docs
2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d
Added beacon module docs to the module index
2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c
Added cross-references to the inotify beacon module
2015-01-26 18:19:34 -07:00
Thomas S Hatch
5affea1022
Merge branch '2015.2' into beacons
2015-01-26 16:57:43 -07:00
Shane D Lee
7c253f5ede
Changed exe's to installers
2015-01-26 15:48:03 -07:00
Thomas S Hatch
bfc6ead3b0
Merge pull request #20039 from bechtoldt/doc_various_fixes
...
completing some doc references
2015-01-26 12:15:38 -07:00
Thomas S Hatch
5cc9a7c249
Merge pull request #20037 from bechtoldt/fix_19262
...
add missing file_tree and virtkey in pillar index doc, refs #19262
2015-01-26 12:15:02 -07:00
Colton Myers
a17c3716bd
Merge remote-tracking branch 'upstream/2015.2' into develop
2015-01-26 10:16:37 -07:00
Thomas S Hatch
828906d62d
Merge branch '2015.2' into beacons
2015-01-25 09:26:43 -07:00
Arnold Bechtoldt
439f253998
adding runners to doc salt.runners reference
2015-01-24 22:46:06 +01:00
Arnold Bechtoldt
4e72fdedb2
adding returners to doc salt.returners reference
2015-01-24 22:44:03 +01:00
Arnold Bechtoldt
2ad37d0bca
adding renderers to doc salt.renderers reference
2015-01-24 22:41:54 +01:00
