69577 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	d9a96c0e4c	Merge pull request #33431 from s-schweer/rabbitmq_user_2 ... fix difference between tag output of rabbitmq 2 and 3	2016-05-25 11:16:13 -07:00
Stefan Schweer	a6c9f2b120	added missing whitespaces	2016-05-25 19:56:00 +02:00
Mike Place	395374b4d2	Merge pull request #33149 from skizunov/develop2 ... Fix broken reactor function calls	2016-05-25 10:32:41 -07:00
Mike Place	0187d0e87e	Merge pull request #33108 from s0undt3ch/features/cli-deamons-runtests ... [WIP] runtests.py CLI deamons	2016-05-25 10:20:57 -07:00
Mike Place	70ce865925	Merge pull request #33259 from whatevsz/firewalld ... Enhance firewalld state.	2016-05-25 10:11:52 -07:00
Alejandro Bednarik	1d9833162b	modules.ethtool: __virtual__ return err msg. (#33484) ... Updated err message when ethtool python libraries are not installed.	2016-05-25 10:16:16 -06:00
Alejandro Bednarik	90e7be1240	modules.rpmbuild: __virtual__ return err msg. (#33498) ... Updated __virtual__ err message when OS family is not supported.	2016-05-25 10:12:00 -06:00
Mike Place	3d6a2fab11	Merge pull request #33492 from sodium-chloride/develop-2016-0525-0003 ... Fix trivial grammar and spelling errors in the doc	2016-05-25 08:05:54 -07:00
Stefan Schweer	169dec76b7	improved tests	2016-05-25 10:23:14 +02:00
Stefan Schweer	f84740957a	rebased on develop	2016-05-25 10:22:10 +02:00
Stefan Schweer	f8d2322f82	fix difference between tag output of rabbitmq 2 and 3	2016-05-25 10:19:51 +02:00
Jεan Sacren	e39c3e29b4	Fix trivial grammar and spelling errors in the doc	2016-05-25 00:07:44 -06:00
Sergey Kizunov	80794636e1	Fix broken reactor function calls ... Broken by PR #32938 salt/client/mixins.py: - In `SyncClientMixin._low`, `salt.utils.format_call` is invoked. The `salt.utils.format_call` function will return a dict containing 'args' and 'kwargs', not 'arg' and 'kwarg' as was changed by PR #32938. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>	2016-05-24 21:24:52 -05:00
Mike Place	dd10fdc8ba	Merge pull request #33416 from sangoma/files_diff_event ... Add files map to fileserver cache event	2016-05-24 10:49:42 -07:00
Stefan Schweer	30219ab5b3	Cloud azure (#33468) ... * suppress annoying NameError for salt-cloud * suppress annoying NameError for salt-cloud * fixed lint errors	2016-05-24 10:39:42 -06:00
Mike Place	541fde64b7	Merge pull request #33434 from whatevsz/fix-reactor ... Fix reactor engine not being loaded.	2016-05-24 09:19:03 -07:00
skizunov	ed37b59e96	Fix: Sometimes reactor does not find runner function (#33460) ... salt/utils/reactor.py: - The reactor currently spawns a thread for each reaction. Previously, the runner symbols were loaded in the spawned threads when iterated via `verify_fun()` in `salt.client.mixins.SyncClientMixin._low()`. This sometimes caused race conditions when two threads were trying to handle a similar reactor (eg presence events) and hence were both invoking `verify_fun`. The second thread sometimes would not be able to find the module function and fail. Now we load the module functions before spawning the thread. - Do the same thing for wheel functions since it seems to have the exact same race condition. Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>	2016-05-24 08:53:41 -07:00
Shane Lee	091f3e12bc	Return full pending computer name (develop) (#33461) ... * Return full pending computer name * Fix logic in set_computer_name	2016-05-24 08:13:15 -07:00
Nicole Thomas	f6fd5cb88b	Merge pull request #33456 from rallytime/merge-develop ... [develop] Merge forward from 2016.3 to develop	2016-05-24 08:58:35 -06:00
Alejandro Bednarik	6de2462b15	modules.zabbix: __virtual__ return err msg. (#33471) ... Updated __virtual__ err message when Zabbix is not installed.	2016-05-24 07:05:40 -07:00
rallytime	5fd6ed04f5	Pylint	2016-05-23 17:01:05 -06:00
rallytime	e6bbc82b58	Merge branch '2016.3' into 'develop' ... Conflicts: - salt/grains/core.py - salt/modules/aptpkg.py - salt/pillar/stack.py - salt/returners/local_cache.py - salt/runners/manage.py	2016-05-23 16:22:37 -06:00
Nicole Thomas	6e77d2946b	Merge pull request #33453 from rallytime/merge-2016.3 ... [2016.3] Merge forward from 2015.8 to 2016.3	2016-05-23 16:07:41 -06:00
rallytime	3aa1e6701c	Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/modules/win_pkg.py	2016-05-23 15:10:06 -06:00
Nicole Thomas	e4f00f92c4	Make sure the path we're removing is present first - avoid an OSError (#33440) ... * Make sure the path we're removing is present first - avoid an OSError * Make check for t_path more efficient * whitespace	2016-05-23 14:04:18 -07:00
Moe	f48aa8f565	Add advanced settings config to win_iis (#33407)	2016-05-23 14:02:14 -07:00
Mike Place	a4abcc3d03	Remove rabbitmq unit tests (#33451) ... * Remove completely pointless RabbitMQ unit test Why would we even write tests to check to see if a mocked object returns a string and then assert against that string?! This is absurd. * Spurious print	2016-05-23 13:57:22 -07:00
Nicole Thomas	93fd00b83d	Avoid a syntax error by using " instead of escaped ' (#33443) ... Fixes #26913	2016-05-23 13:45:42 -07:00
Nicole Thomas	5d6e447bb7	Move 2016.40 --> Carbon versionadded tag (#33441)	2016-05-23 12:17:11 -06:00
msciciel	5daf7201c3	ckEthtool state (#33394) ... * Correct docstrings in ethtool module * New state ethtool	2016-05-23 11:58:59 -06:00
Kai Howelmeyer	e1119fea4e	Fix typo in file.directory max_depth help (#33420)	2016-05-23 11:57:29 -06:00
Rigel Marcinik	ec60b9c45c	Fix virtual function (#33436) ... exec_action is not present in the bigip execution module, so change it to list_transaction.	2016-05-23 11:56:50 -06:00
Nicole Thomas	6e94a4a03b	Merge pull request #33438 from rallytime/merge-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2016-05-23 11:50:51 -06:00
Nicole Thomas	ede804b4f6	Merge pull request #33426 from abednarik/virtual_ret_debbuild_module ... modules.debbuild: __virtual__ return err msg.	2016-05-23 11:23:00 -06:00
Pedro Algarvio	e1587261c9	The scripts directory is now a subdirectory of TMP so it gets cleaned up.	2016-05-23 18:04:47 +01:00
Hannes Körber	83aacc3b32	Fix reactor engine not being loaded. ... The reactor engine was not loaded when there was not explicitly defined in the configuration file. See issue #33090	2016-05-23 18:03:33 +02:00
Alejandro Bednarik	085e70a9d2	modules:multiple boto __virtual__ return err msg. (#33425) ... Updated __virtual__ err msg fot he following boto modules: boto_cloudtrial, boto_datapipeline, boto_iot, boto_s3_buscket	2016-05-23 09:53:53 -06:00
Alejandro Bednarik	c9d0de46cc	Documentation update in file.serialize. (#33421) ... Updated versionadded for dataset_pillar.	2016-05-23 09:50:49 -06:00
rallytime	7c41c34528	Merge branch '2015.5' into '2015.8' ... No conflicts.	2016-05-23 09:40:21 -06:00
Pedro Algarvio	580271d966	First get a new port, then close the offending.	2016-05-23 16:33:29 +01:00
ghoz	9e6ae66bb2	adds missing versionadded (#33419) ... * adds missing versionadded adds missing versionadded to states.archive.extracted: trim_outpout and source_hash_changed appeared in v2016.3 * broke docstring indentation	2016-05-23 08:21:24 -07:00
Pedro Algarvio	659705becb	How did I lost 4cec747a36	2016-05-23 15:54:21 +01:00
Pedro Algarvio	15b0a399cb	If psutil is available, make sure we kill all process children	2016-05-23 15:40:50 +01:00
Pedro Algarvio	320dc0b606	Turn subprocesses logging proxying back on. ... Make sure none of the hard coded ports are used when grabbing an unused port	2016-05-23 13:57:22 +01:00
Pedro Algarvio	17798f7b69	We need to use a multiprocessing Queue	2016-05-23 13:57:22 +01:00
Pedro Algarvio	d2b696ba8b	We don't currently support colors on windows	2016-05-23 13:57:22 +01:00
Pedro Algarvio	3a755208f4	Var typo	2016-05-23 13:57:22 +01:00
Pedro Algarvio	85f83c773e	Fix extension modules path	2016-05-23 13:57:22 +01:00
Pedro Algarvio	76c5e105b0	More conf fixes	2016-05-23 13:57:21 +01:00
Pedro Algarvio	3adf8e286e	Some more test suite run fixes ... * Allow more time for the daemons to react to the signals sent * Fix configuration * More logging	2016-05-23 13:57:21 +01:00