Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
Justin Findlay
6b6280442c
disable intermittently failing tests
...
This commit is to be reverted when #23623 is merged.
2015-05-28 16:23:57 -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
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
d6fe499f55
Allow compound expressions to begin with "not"
2015-04-22 17:38:17 -06:00
Pedro Algarvio
f7e6f716e3
Make PEP-8 checker happier
2015-04-21 20:35:14 -06:00
Colton Myers
ef583295d5
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Thayne Harbaugh
b37b6b2849
Add a test for incorrectly-nested nodegroups that cause a resolution loop.
2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9
Fix failure with nested nodegroups:
...
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:
Failed nodegroup expansion: illegal nested nodegroup "min"
This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.
* Add another test case for this situation.
* Pop the current nodegroup from `skip` when leaving the expansion
context
Fixes : #22797
2015-04-17 15:20:34 -06:00
rallytime
1e4b93dec9
Python 3 compat fixes for develop
2015-04-17 12:00:01 -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
b626149245
fix tests
2015-04-15 11:59:25 -06:00
Colton Myers
5b6d410119
Fix calltest
2015-04-11 15:59:06 -04:00
Colton Myers
99744b9568
Fix lint
2015-04-11 15:56:09 -04:00
Colton Myers
cc8785e980
Fix the test.fib tests
2015-04-11 14:48:59 -04:00
Thayne Harbaugh
1c3536fb8e
Support nested nodegroups
...
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions. Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Thomas S Hatch
234cb65a23
Merge pull request #22319 from plastikos/improvement-pillar_pcre
...
Improvement: add pillar PCRE matching
2015-04-07 09:09:49 -06:00
Thayne Harbaugh
a7a33b381c
Various fixes:
...
* Add missing spaces in help
* Correct order of arguments to _check_cache_minions() (not part of pillar_pcre)
* Add platening of pillar_pcre to pillar_exact_minions
* Add missing match to pillar_pcre
* Correct unit test
2015-04-03 18:32:52 -06:00
Justin Findlay
fb8b1858a7
shell {en|dis}abled tests for cmdline, templates
2015-04-03 18:08:13 -06:00
Thayne Harbaugh
c91392bc91
Add option -J/--pillar-pcre to match on pillar PCREs
2015-04-03 02:47:19 -06:00
Colton Myers
3c5f9af2d4
Lint (blank lines)
2015-03-21 15:36:04 -06:00
Colton Myers
70406867a4
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
salt/client/__init__.py
salt/modules/file.py
salt/modules/yumpkg.py
salt/modules/zypper.py
tests/integration/shell/auth.py
tests/unit/states/archive_test.py
tests/unit/states/module_test.py
2015-03-20 20:09:19 -06:00
Colton Myers
2b1f400ab4
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/topology/syndic.rst
salt/client/__init__.py
salt/daemons/masterapi.py
salt/minion.py
salt/modules/dockerio.py
2015-03-19 16:03:29 -06:00
Justin Findlay
f735f0b96d
add eauth pam group tests
...
Adds test for #17380 .
2015-03-17 14:25:57 -06:00
Justin Findlay
ebc6a1f4c8
fix matcher tests for 2015.2->develop merge
2015-02-23 15:39:44 -07:00
Colton Myers
c8eb2d4665
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
doc/topics/installation/windows.rst
salt/cloud/clouds/joyent.py
salt/daemons/flo/core.py
salt/minion.py
2015-02-23 14:25:51 -07:00
Colton Myers
c3b7be0655
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/installation/rhel.rst
salt/output/__init__.py
salt/utils/__init__.py
2015-02-20 13:51:59 -07:00
Justin Findlay
0d6663b8a8
conform shell integration tests to txt runner
2015-02-17 15:40:17 -07:00
Pedro Algarvio
dc2d3b8ba2
The imports do work!
2015-01-30 22:25:29 +00:00
Pedro Algarvio
788bb913c6
Py3 compatibility fixes.
2015-01-30 22:25:28 +00:00
Pedro Algarvio
8fa37d65eb
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
cb6531293c
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
b555ddf658
Py3 compatibility fixes
2015-01-30 22:25:09 +00:00
Pedro Algarvio
60f215f191
Add from __future__ import absolute_import
2015-01-30 22:25:04 +00:00
Pedro Algarvio
9d0fe5b1d1
Merge branch '2014.7' into 2015.2
...
Conflicts:
salt/modules/brew.py
tests/integration/__init__.py
2015-01-11 22:40:16 +00:00
Mike Place
7d4123c6b3
Async flag and test cleanup
2015-01-09 21:21:50 -07:00
Mike Place
9d7990f264
Async flag and test cleanup
2015-01-09 13:14:33 -07:00
Pedro Algarvio
733b31da23
Merge branch '2014.7' into develop
...
Conflicts:
tests/unit/modules/hashutil_test.py
tests/unit/templates/jinja_test.py
2014-11-27 03:59:40 +00:00
Pedro Algarvio
62ec46d6dd
Switch open() for salt.utils.fopen()
2014-11-26 23:37:01 +00:00
Pedro Algarvio
d957d2e911
Switch open() for salt.utils.fopen()
2014-11-26 23:36:26 +00:00
Pedro Algarvio
bea345e720
Switch open() for salt.utils.fopen()
2014-11-26 23:35:31 +00:00
Pedro Algarvio
1857a0d31f
Switch open() for salt.utils.fopen()
2014-11-26 23:30:18 +00:00
Pedro Algarvio
8735242906
We need to call read()!
2014-11-26 23:13:19 +00:00
Pedro Algarvio
1eeb02d93f
Add a missed with
2014-11-26 21:07:39 +00:00
Pedro Algarvio
47edf6fc89
Fix the with context
2014-11-26 20:49:04 +00:00
Pedro Algarvio
bfe99dbb3f
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/__init__.py
salt/modules/file.py
salt/modules/zcbuildout.py
salt/runners/lxc.py
salt/runners/manage.py
2014-11-26 20:14:56 +00:00
Pedro Algarvio
2d210b9055
Switch open() for salt.utils.fopen()
2014-11-26 18:33:22 +00:00
Pedro Algarvio
d27c38d28f
Switch open() for salt.utils.fopen()
2014-11-26 17:57:57 +00:00
Pedro Algarvio
70b657af20
Switch open() for salt.utils.fopen()
2014-11-26 17:56:43 +00:00
Pedro Algarvio
46ea34b4f5
Switch open() for salt.utils.fopen()
2014-11-26 17:55:30 +00:00
