Commit Graph

2414 Commits

Author SHA1 Message Date
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
Thayne Harbaugh
993373655a Allow grain and pillar delimiter to be specified in compound matcher syntax. 2015-04-23 23:26:49 -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
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
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
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
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
Justin Findlay
e586c66917 revise contributing documentation 2015-04-16 10:28:00 -06:00
Colton Myers
ff8561df8d Add minor CVEs to 2014.7.4 release notes 2015-04-15 19:01:28 -06: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
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
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
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
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
Joseph Hall
aa23eb0e26 Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs
Migrate old cloud config documentation to own page
2015-04-08 12:32:35 -06:00
Colton Myers
5f1a4b45b8 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-08 10:38:34 -06:00
Thomas Jackson
92ff4ff37f typo fixing! 2015-04-08 09:15:50 -07:00
Thomas Jackson
3b7170dc71 Add initial transport docs 2015-04-08 09:08:13 -07:00
rallytime
cecca10668 Kill legacy cloud configuration syntax docs per techhat 2015-04-07 20:09:37 -06:00
rallytime
52a3d500e8 Beef up cloud configuration syntax and add pillar config back in 2015-04-07 18:56:40 -06:00