Mike Place
|
27465e0f0f
|
Merge pull request #22129 from terminalmage/docker-ng
Add docker-ng module
|
2015-03-30 10:37:45 -06:00 |
|
Mike Place
|
adb8d5c718
|
Merge pull request #22054 from jfindlay/log_color
convert custom LogRecord attribute formatting from {}- to %-style
|
2015-03-30 10:37:18 -06:00 |
|
Elias Probst
|
c00c14f2be
|
Initial documentation improvements for pillar.pillar_ldap
|
2015-03-30 01:58:54 +02:00 |
|
Erik Johnson
|
2e823b84e8
|
Add docker-ng module
|
2015-03-29 12:32:07 -05:00 |
|
Erik Johnson
|
f7e6523461
|
Add dockerng execution module docs to toctree
|
2015-03-29 12:32:07 -05:00 |
|
Erik Johnson
|
6846d3e01b
|
Update the exclude-members for lxc module
|
2015-03-29 12:32:07 -05:00 |
|
Erik Johnson
|
d9f0273680
|
Update the exclude-members for nspawn module
|
2015-03-29 12:32:07 -05:00 |
|
Justin Findlay
|
294dfe2d94
|
clarify and expand console log colors help
|
2015-03-26 23:21:30 -06:00 |
|
John Syrinek
|
6558d9e6d7
|
Fix unless example
The second `unless` example failed to compile
|
2015-03-24 14:02:27 -05:00 |
|
Godefroid Chapelle
|
ffe267a741
|
Specify valid values for gitfs_provider option
|
2015-03-23 15:33:10 +01:00 |
|
Arnold Bechtoldt
|
db38f80945
|
update references, fixes #21879
|
2015-03-22 10:16:41 +01:00 |
|
Colton Myers
|
fd93491a5f
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/cloud/clouds/linodepy.py
salt/master.py
salt/modules/boto_route53.py
salt/modules/virt.py
salt/renderers/gpg.py
salt/runners/doc.py
salt/runners/jobs.py
salt/runners/manage.py
salt/runners/virt.py
salt/utils/event.py
salt/utils/http.py
|
2015-03-16 15:12:02 -06:00 |
|
Thomas S Hatch
|
cc9d294fcd
|
Merge pull request #21569 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
|
2015-03-12 13:36:39 -06:00 |
|
rallytime
|
0171f68600
|
Use the full version for a versionadded tag
|
2015-03-11 16:29:08 -06:00 |
|
Colton Myers
|
fec632ae18
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
salt/utils/cloud.py
|
2015-03-11 15:18:00 -06:00 |
|
Colton Myers
|
ebe7eeafd9
|
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
doc/conf.py
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/cloud/clouds/linode.py
salt/states/composer.py
salt/states/win_update.py
|
2015-03-11 15:14:56 -06:00 |
|
Elias Probst
|
bc9a30b7e9
|
Typo (rendered → renderer)
|
2015-03-11 21:15:32 +01:00 |
|
Seth House
|
049975a1ca
|
Added versionadded for ext_pillar_first
|
2015-03-11 11:53:59 -04:00 |
|
Colton Myers
|
d17c908b42
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
doc/topics/pillar/index.rst
salt/beacons/diskusage.py
salt/beacons/network_info.py
salt/minion.py
salt/modules/iptables.py
salt/modules/nacl.py
salt/modules/win_firewall.py
|
2015-03-09 12:52:14 -06:00 |
|
Thomas Jackson
|
b8e39c13f9
|
Add docs for new raw boolean support of depends decorator
|
2015-03-05 22:02:34 -08:00 |
|
Erik Johnson
|
ec2fe0d553
|
Add nspawn.remove function
Also adds nspawn.destroy as an alias, for those who are used to managing
LXC containers.
|
2015-03-03 14:38:53 -07:00 |
|
Erik Johnson
|
046a8fed7a
|
Add compatibility function "remove"
For people using a mix of LXC and nspawn containers
|
2015-03-03 14:36:45 -07:00 |
|
Erik Johnson
|
ee570cf0a2
|
Add RST file for nspawn
|
2015-03-03 10:10:50 -07:00 |
|
Thomas S Hatch
|
3467622977
|
Merge pull request #21229 from thatch45/master_service
Engines
|
2015-03-03 09:35:48 -07:00 |
|
Seth House
|
714921a5dc
|
Added autosummary placeholders for new models
|
2015-03-02 22:14:33 -07:00 |
|
Seth House
|
b6c1b2601f
|
Added new modules to the module indexes
|
2015-03-02 22:13:42 -07:00 |
|
Seth House
|
1399949196
|
Merge remote-tracking branch 'upstream/2015.2' into develop
|
2015-03-02 14:19:37 -07:00 |
|
Seth House
|
57b1f67daa
|
Added autosummary generated placeholders for the new module docs
|
2015-03-02 14:07:18 -07:00 |
|
Seth House
|
1382401618
|
Updated all the module index pages with the latest/newest modules
|
2015-03-02 13:59:19 -07:00 |
|
Seth House
|
b001cb6534
|
Added engine modules to modules index in docs
|
2015-03-02 13:49:17 -07:00 |
|
C. R. Oldham
|
f171df4311
|
Merge forward 2015.2->develop
|
2015-03-01 19:54:22 -07:00 |
|
C. R. Oldham
|
00942f2060
|
Merge forward 2014.7->2015.2
|
2015-03-01 17:55:25 -07:00 |
|
Seth House
|
4d974d9676
|
Improved presence docs; added cross-references and localhost caveat
Closes #18436.
|
2015-02-28 19:22:38 -07:00 |
|
Erik Johnson
|
94d55889d7
|
Resolve merge conflicts
|
2015-02-28 12:35:25 -06:00 |
|
C. R. Oldham
|
c9610bc4f2
|
Merge commit, merge forward 2014.7 to 2015.2
|
2015-02-27 15:01:30 -07:00 |
|
Erik Johnson
|
4ce8a9d064
|
Improve salt fileserver documentation
|
2015-02-27 14:53:57 -07:00 |
|
Erik Johnson
|
a7ba699ad7
|
remove grains outputter from autosummary
|
2015-02-27 18:12:18 +01:00 |
|
Erik Johnson
|
abf00abea4
|
remove the docs' .rst file for deleted grains outputter
See e1f8ea6.
|
2015-02-27 18:12:18 +01:00 |
|
Ryan Lane
|
1bc840a3a9
|
Add missing boto docs
|
2015-02-25 12:50:44 -08:00 |
|
Erik Johnson
|
db85cd43f7
|
Improve salt fileserver documentation
|
2015-02-24 22:37:30 -06:00 |
|
Alexander Pyatkin
|
5edb6cba11
|
Implement Bower state module
|
2015-02-21 05:57:54 +00:00 |
|
Alexander Pyatkin
|
c408c935a0
|
Implement Bower execution module
|
2015-02-21 05:56:20 +00:00 |
|
Colton Myers
|
f00465a8a1
|
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
doc/topics/event/index.rst
salt/loader.py
salt/modules/config.py
salt/modules/cyg.py
salt/modules/hg.py
salt/modules/lxc.py
salt/modules/upstart.py
salt/states/hg.py
salt/utils/cloud.py
salt/utils/dictupdate.py
salt/utils/schedule.py
tests/integration/fileserver/gitfs_test.py
tests/unit/pydsl_test.py
|
2015-02-18 11:55:29 -07:00 |
|
dsumsky
|
6d797f50d4
|
- log_level_logfile and log_level configuration options inheritance docu updated
|
2015-02-12 19:47:59 +01:00 |
|
Erik Johnson
|
93835d3f4e
|
Hide set_pass from lxc state docs
|
2015-02-10 15:06:46 -06:00 |
|
Arnold Bechtoldt
|
88dea95c6c
|
add some cosmetic changes to the state requisites article
|
2015-02-07 18:46:03 +01:00 |
|
Amir Pakdel
|
eabb8a262c
|
Added MS SQL execution module
|
2015-02-03 10:02:09 -05: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 |
|
Seth House
|
e3d29bf8ff
|
Fixed syntax error in log_granular_levels example
|
2015-01-27 20:14:53 -07:00 |
|