Colton Myers
befb666623
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/modules/mongodb.py
salt/utils/http.py
salt/utils/process.py
tests/integration/__init__.py
2015-04-27 10:28:53 -06:00
Thomas S Hatch
9ca2d58b10
Merge pull request #23058 from plastikos/improvement-compound_as_list
...
[improvement] compound match as list
2015-04-25 10:57:49 -06:00
Thayne Harbaugh
6f4cfd01fc
Specify compound matches as lists
...
Compound matches, such as nodegroups, can now be specified as lists. This
avoids splitting on whitespace which may be part of a key or value.
Right now this only works for nodegroups. Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
C. R. Oldham
63fafe961e
Clarify the nature of auth and start events.
2015-04-24 12:46:32 -06:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Justin Findlay
24d2c6f501
Merge pull request #23011 from plastikos/improvement-leading_not
...
Add a versionadded note for the leading "not"
2015-04-24 08:11:34 -06:00
Thayne Harbaugh
993373655a
Allow grain and pillar delimiter to be specified in compound matcher syntax.
2015-04-23 23:26:49 -06:00
Thayne Harbaugh
bbd063fdee
Add a versionadded note for the leading "not"
2015-04-23 22:27:10 -06:00
Thomas S Hatch
de24ecfc90
Merge pull request #22966 from techhat/stormpathup
...
Updates to Stormpath as per @rdegges
2015-04-23 21:44:58 -06:00
Thomas S Hatch
57999117f2
Merge pull request #22969 from plastikos/improvement-leading_not
...
Allow compound expressions to begin with "not"
2015-04-23 21:44:45 -06:00
Justin
8486e17ab3
Added retry_dns to minion doc.
2015-04-23 15:33:59 -06:00
Jonathan Ballet
19efd419b5
Improve state_output documentation
...
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
2015-04-23 10:22:11 +02:00
Thayne Harbaugh
d6fe499f55
Allow compound expressions to begin with "not"
2015-04-22 17:38:17 -06:00
Joseph Hall
2a4ef7ce3b
Updates to Stormpath as per Randall Degges
2015-04-22 15:59:09 -06:00
Colton Myers
82477562dd
Release 2014.7.5
2015-04-22 15:56:03 -06:00
Colton Myers
1a38b4b834
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/cli/salt.py
salt/client/mixins.py
salt/renderers/pyobjects.py
2015-04-22 11:07:01 -06:00
Thomas S Hatch
022a43aaa9
Merge pull request #22904 from jacobhammons/2015.2
...
Regenerated man pages
2015-04-21 12:51:48 -06:00
Jacob Hammons
99abfd7755
Regenerated man pages
2015-04-21 11:33:30 -06:00
Jacob Hammons
32ef5ca397
Revert "Regenerated man pages"
...
This reverts commit 069a0cac71
2015-04-21 11:27:31 -06:00
Jacob Hammons
069a0cac71
Regenerated man pages
2015-04-21 11:20:52 -06:00
Colton Myers
bd6ecdfd43
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
salt/pillar/pepa.py
salt/states/artifactory.py
salt/states/pip_state.py
salt/transport/__init__.py
2015-04-21 10:42:22 -06:00
Colton Myers
92c51affc5
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-21 10:33:39 -06:00
Pedro Algarvio
95d6887949
Don't fail on make clean just because the directory does not exist
2015-04-21 00:46:09 +01:00
Colton Myers
1f9934c634
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/gitfs.rst
2015-04-20 11:39:41 -06:00
Joseph Hall
3b17858052
Merge pull request #22837 from nmadhok/vmware-cloud-driver
...
Making vmware cloud driver Python3 compatible and other additions
2015-04-19 15:57:43 -06:00
Nitin Madhok
64e527c4dc
Adding ability to modify/create SCSI adapters #22364
2015-04-18 17:09:11 -04:00
Justin Findlay
900c7a510f
Merge pull request #22800 from terminalmage/issue21979
...
Improve error logging for pygit2 SSH-based remotes
2015-04-18 11:18:55 -06:00
Justin Findlay
e99f2fdb28
Merge pull request #22813 from twangboy/win_doc_fix
...
Updated instructions for building salt
2015-04-17 22:10:07 -06:00
Nicole Thomas
dcd9e16a5c
Merge pull request #22784 from techhat/stormpath
...
Adding and updating Stormpath modules
2015-04-17 16:50:25 -06:00
twangboy
adc421acdd
Fixed some formatting issues
2015-04-17 15:03:47 -06:00
twangboy
8901b3b5a6
Updated instructions for building salt
2015-04-17 14:41:46 -06:00
rallytime
5931a582d1
Replace all 4s with 5s
2015-04-17 14:15:33 -06:00
rallytime
eadaead755
Add 2014.7.5 links to windows installation docs
2015-04-17 14:13:40 -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
Erik Johnson
98885f71d6
Add information about libssh2 requirement for pygit2 ssh auth
2015-04-17 13:24:14 -05:00
rallytime
fde1feed46
Remove extra line
2015-04-17 11:42:14 -06:00
rallytime
b19b95d992
Added release note for 2014.7.5 release
2015-04-17 11:41:07 -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
