Nicole Thomas
dcd9e16a5c
Merge pull request #22784 from techhat/stormpath
...
Adding and updating Stormpath modules
2015-04-17 16:50:25 -06:00
rallytime
36b54ee79b
Remove extra line
2015-04-17 12:53:58 -06:00
rallytime
93a858c591
Added release note for 2014.7.5 release
2015-04-17 12:53:50 -06:00
Joseph Hall
7ee6103007
Adding and updating Stormpath modules
2015-04-17 08:37:23 -06:00
Colton Myers
2210bd175e
Merge pull request #22668 from basepi/merge-forward-develop
...
Merge forward from 2015.2 to develop
2015-04-16 23:22:36 -06:00
Erik Johnson
e51a8e0e4a
Add external anchor for "reloading modules" section of state docs
2015-04-16 20:17:25 -05:00
rallytime
662593c902
Change latest release version in doc sidebar
2015-04-16 15:00:36 -06:00
Colton Myers
66378be75e
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/ref/states/requisites.rst
salt/master.py
salt/modules/win_pkg.py
2015-04-16 12:27:53 -06:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Thomas S Hatch
b6e803910f
Merge pull request #22753 from thatch45/doc_clear
...
fix some bad sls data in a doc
2015-04-16 11:58:17 -06:00
Thomas S Hatch
b20dbb822b
fix some bad sls data in a doc
2015-04-16 11:49:35 -06:00
Colton Myers
ccfcedbf6b
Go back to the 2015.2 version of salt.7
2015-04-16 11:46:30 -06:00
Colton Myers
8d9874a78a
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-16 10:37:38 -06:00
Justin Findlay
e586c66917
revise contributing documentation
2015-04-16 10:28:00 -06:00
Markus "Shorty" Uckelmann
1341784184
improve cmd.run env documentation
...
Resolves #21840
Improved documentation to cmd.run(et.al.) env argument by mentioning
that variables as values will not be evaluated.
2015-04-16 11:20:20 +02:00
Thomas S Hatch
6452590351
Merge pull request #22728 from whiteinge/fix-docmageddon
...
Add several modules to the mocked modules list for the docs build
2015-04-15 19:58:57 -06:00
Thomas S Hatch
f5b62236a0
Merge pull request #22726 from VynceMontgomery/patch-2
...
fix link to bug reporting in FAQ
2015-04-15 19:57:59 -06:00
Colton Myers
ff8561df8d
Add minor CVEs to 2014.7.4 release notes
2015-04-15 19:01:28 -06:00
Seth House
fe8f3e0bce
Added generated doc for clustershell roster module
2015-04-15 18:34:27 -06:00
Vynce Montgomery
80d6e9ec94
fix link to bug reporting in FAQ
...
linebreak and bad path; one way or another, this was not rendering as a link.
2015-04-15 16:54:11 -07:00
Seth House
aaf1917bdf
Add mocked references for new module additions
2015-04-15 17:52:10 -06:00
Seth House
767c328420
Remove docs for old nagios_json module
2015-04-15 17:52:06 -06:00
Vynce Montgomery
0d2a0a3607
fix alphabetization
...
things appeared to be missing because they were out of order.
2015-04-15 15:39:10 -07:00
Oliver Bestwalter
20ce197674
Add mention of Windows release candidates
...
... so the windows folks realize, that they can test RCs easily as well :)
2015-04-15 21:32:48 +02:00
Thomas S Hatch
b8e0638753
Merge pull request #22616 from alxbse/winrm-support
...
add initial support for WinRM in Windows cloud deployment
2015-04-15 09:55:30 -06:00
Justin Findlay
3a5a60b5a7
Merge pull request #22688 from msteed/issue-22676
...
Add missing command line options to man pages
2015-04-14 23:17:47 -06:00
Michael Steed
70f1ca9ea5
Add missing command line options to man pages
...
Refs #22676
2015-04-14 17:32:56 -06:00
Jacob Hammons
6e416fc300
Regenerated salt-call and salt.7 man pages Refs #22239
2015-04-14 13:56:31 -06:00
Michael Steed
5efb284c22
Update salt-call manpage to match cli help text
...
refs #22239
2015-04-14 11:52:55 -06:00
Wolodja Wentland
c52e9a94af
Remove enabled option from pkgrepo.managed
...
The 'enabled' option was highly ambiguous in that pkgrepo.managed also supports
a 'disabled' one that should be enough to express if a repository should be
enabled or disabled. It is also assumed that users who use pkgrepo.managed also
intend to use the repository later on which is why we set 'disabled' to False by
default.
This closes #22147
2015-04-14 18:05:03 +01:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Corin Kochenower
60b48ce1c0
Simple textual change
2015-04-14 08:54:34 -06:00
rallytime
becc997de4
Apply release note fix to develop branch
2015-04-13 15:34:24 -06:00
rallytime
fb03af37d3
Add note about missing state internal keyword arguments to release notes
2015-04-13 15:29:55 -06:00
Thomas S Hatch
8712a8b14c
Merge pull request #22614 from rallytime/apply-22610
...
Apply release note change to develop
2015-04-13 15:26:25 -06:00
Alexander Backlund
b7db2080d8
add initial support for WinRM in Windows cloud deployment
...
fixes saltstack/salt#15984
2015-04-13 16:03:37 -04:00
rallytime
1f243d6276
Apply release note change to develop
2015-04-13 13:53:03 -06:00
rallytime
9eb273f097
Add batch matching bug note to known issues in 2014.7.4 release notes
2015-04-13 13:35:48 -06:00
Nitin Madhok
031bb2bd65
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2015-04-13 12:29:39 -04:00
Nitin Madhok
39f31b1ab0
Adding salt.engines.sqs_events.rst to doc
2015-04-13 12:20:42 -04:00
Nitin Madhok
87e70a7d3a
Adding salt.engines.logstash.rst to doc
2015-04-13 12:20:09 -04:00
Mike Place
6a11ead5b4
Merge pull request #22453 from jacksontj/transport
...
Abstracted Transport
2015-04-13 09:38:52 -06:00
Joseph Hall
bbdf316063
Merge pull request #22483 from nmadhok/vmware-cloud-driver
...
Adding more features to vmware cloud driver
2015-04-11 18:31:03 -06:00
Nitin Madhok
4ab84a6bca
Adding some documentation
2015-04-10 17:39:30 -04:00
rallytime
ccfa9f8158
Fix some broken links on the contributing docs
...
Fixes #22537
2015-04-10 14:06:36 -06:00
Thomas S Hatch
fbf35f94ab
Merge pull request #22491 from plastikos/improvement-nested_nodegroups
...
improvement: Support nested nodegroups
2015-04-10 09:17:27 -06:00
Piotr Kasprzyk
6789306071
Fix misspellings
2015-04-10 12:21:20 +02:00
shanedlee
c874ca8c20
Added additional details regarding windows implementation
2015-04-09 11:32:13 -04:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
David Beitey
22ad5d0063
Update git URL & formatting for Windows install
...
Secure cloning is the standard practice for GitHub (vs ``git://``); other minor formatting improvements.
2015-04-09 10:42:28 +10:00