Mike Place
389a689be9
Merge pull request #41604 from plassa-b/develop
...
Allow the user to get multiple service statuses at once through globbing
2017-06-19 12:35:59 -05:00
Mike Place
89e88738b2
Merge pull request #41647 from cetanu/patch-3
...
cloud vmware get_instance [size] #38814
2017-06-19 12:06:50 -05:00
Mike Place
ffb8149de4
Merge pull request #41777 from garethgreenaway/41742_adding_force_option
...
Additions to lvm module and state module
2017-06-19 11:56:44 -05:00
Mike Place
6ffe501e17
Merge pull request #41825 from alexbleotu/proxy_fixes-gh
...
Injected the __proxy__ dunder in remaining state execution functions
2017-06-19 11:31:31 -05:00
Mike Place
9ccfcfffe6
Merge pull request #41796 from farcaller/grains-cache
...
Refactored grains cache loader.
2017-06-19 11:24:10 -05:00
Mike Place
8919936244
Merge pull request #41809 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-06-19 10:44:57 -05:00
Alexandru Bleotu
2a4835961c
Injected the __proxy__ dunder in remaining state execution functions
2017-06-19 10:55:03 +01:00
garethgreenaway
0973a6899e
Merge pull request #41789 from ashishdisawal/develop
...
Fix for #41762
2017-06-18 21:12:05 -07:00
Ashish Disawal
53c9764339
Merge branch 'develop' into develop
2017-06-18 23:48:53 +05:30
Ashish Disawal
2b9554303a
Checking if 'full' is True
...
Changes for the iptables unit tests.
2017-06-18 23:48:08 +05:30
Nicole Thomas
5d0db7b687
Merge pull request #41722 from garethgreenaway/41667_adding_additional_options
...
Fixes to states/virt.py
2017-06-16 15:24:18 -06:00
Nicole Thomas
1404423f97
Merge pull request #41806 from epelc/patch-1
...
fix(docker): allow log_driver or log_opt
2017-06-16 14:54:10 -06:00
Nicole Thomas
0183dd961d
Merge pull request #41804 from terminalmage/master-tops
...
Rename ext_nodes to master_tops in codebase
2017-06-16 14:36:00 -06:00
rallytime
4780e99ac2
Merge branch '2017.7' into 'develop'
...
No conflicts.
2017-06-16 11:53:38 -06:00
Ed Pelc
7480bab798
add tests for single docker log_config option fix
2017-06-16 13:05:01 -04:00
Erik Johnson
e8d43a42d1
Rename ext_nodes to master_tops in codebase
...
ext_nodes was replaced in favor of the master_tops system a few years
ago, this changes references in the codebase to refer to master_tops to
make the code more maintainable in the future.
2017-06-16 11:44:30 -05:00
Ed Pelc
a8affc6ce6
fix(docker): allow log_driver or log_opt
...
Docker allows either option without the other and the docks make no mention of both options being required.
2017-06-16 12:40:22 -04:00
Vladimir Pouzanov
a268c34542
Refactored grains cache loader.
...
- refresh_grains_cache opt will now give a distinct debug message
- if the grains fail to load from cache, or if the cache is vaild but is
empty, grains will be reloaded
- dramatically reduced nesting by extracting loader to dedicated function and
inverting the condition clauses.
2017-06-16 14:06:26 +01:00
Cléry Plassat
5e91974cb6
Merge branch 'develop' of github.com:plassa-b/salt into develop
2017-06-16 12:48:28 +02:00
Cléry Plassat
a7974fe508
Patched the windows status test
2017-06-16 12:48:15 +02:00
Vasili Syrakis
6d1fe4f6ea
Merge remote-tracking branch 'origin/patch-3' into patch-3
2017-06-16 17:09:37 +10:00
Vasili Syrakis
370c9ab0b6
Converted cpu/ram to size_dict as discussed in #38814
2017-06-16 17:09:05 +10:00
Vasili Syrakis
bc7894bd97
Merge branch 'develop' of https://github.com/saltstack/salt into patch-3
2017-06-16 17:04:53 +10:00
Vasili Syrakis
11d45d2799
Merge branch 'develop' into patch-3
2017-06-16 16:41:06 +10:00
Ashish Disawal
8034d2d5db
Fix for #41762
...
https://github.com/saltstack/salt/issues/41762
iptables.build_rule does not give full rule even when full=True is provided
Changed as suggested by Daniel
Yes, that should be changed to if full is True
2017-06-16 11:38:24 +05:30
garethgreenaway
899d852791
Merge branch 'develop' into 41742_adding_force_option
2017-06-15 16:07:06 -07:00
garethgreenaway
d41c4ab45b
Merge branch 'develop' into 41667_adding_additional_options
2017-06-15 15:54:30 -07:00
Gareth J. Greenaway
87ff0eb3ad
Adding the force option for situation where the -yes argument needs to be passed along to lvcreate
2017-06-15 13:39:17 -07:00
Mike Place
9c45fa044d
Merge pull request #41748 from terminalmage/issue3415
...
Add comparison operator support for package installation in yum/dnf and apt
2017-06-15 15:32:37 -05:00
Mike Place
a46f6809df
Merge pull request #41758 from twangboy/docs_win_add_master_config
...
Add Windows Master config information
2017-06-15 15:29:27 -05:00
Mike Place
a23f348030
Merge pull request #41773 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-06-15 15:24:45 -05:00
Mike Place
5a2f5df3fe
Merge pull request #41774 from bodhi-space/infra5027
...
INFRA-5027 - delete_tags() requires a list rather than a set...
2017-06-15 15:10:22 -05:00
Tom Williams
37c661102a
INFRA-5027 - delete_keys() requires a list rather than a set...
2017-06-15 14:35:59 -04:00
Mike Place
b12611d122
Merge pull request #41617 from cro/n_proxy_tests
...
Port salt-proxy tests to the testsuite changes in Nitrogen.
2017-06-15 12:07:29 -05:00
rallytime
7fef4cf38f
Merge branch '2017.7' into 'develop'
...
Conflicts:
- salt/engines/slack.py
2017-06-15 10:57:27 -06:00
twangboy
c3dc38587e
Fix indentation
2017-06-15 09:49:13 -06:00
Mike Place
d8b83af3d6
Merge pull request #41745 from terminalmage/fix-runtests-helpers
...
Fix runtests_helpers.modules_available when multiple modules passed
2017-06-15 10:14:16 -05:00
garethgreenaway
fc14a23060
Merge branch 'develop' into 41667_adding_additional_options
2017-06-15 08:13:26 -07:00
Mike Place
c58f3811ce
Merge pull request #41746 from rallytime/version-added-nitrogen
...
Update Nitrogen references to 2017.7.0
2017-06-15 10:12:18 -05:00
Mike Place
b0556bd58b
Merge branch 'develop' into issue3415
2017-06-15 10:09:46 -05:00
Mike Place
3d50d2fa4d
Remove unused import
2017-06-15 09:09:28 -06:00
Nicole Thomas
3e3ef38a20
Merge pull request #41743 from terminalmage/fix-import
...
Fix ImportError in boto3_sns module
2017-06-15 09:06:34 -06:00
Mike Place
cc72f1a9cf
Merge pull request #41754 from mnederlof/debian_ip-patch-routes
...
Fix routes for vlan interfaces under debian/ubuntu
2017-06-15 10:03:53 -05:00
Mike Place
b6b3eb1aa1
Merge pull request #41767 from rallytime/exit_status_test
...
Disable new part of test_exit_status_correct_usage test for now
2017-06-15 10:02:02 -05:00
Mike Place
6fcb9a0fc8
Merge pull request #41755 from jcomeaux/issue40774
...
Adds get_tags method
2017-06-15 10:01:15 -05:00
Mike Place
fbd27744e4
Merge pull request #41764 from cloudflare/fix-capirca
...
Add new term field for capirca Term class
2017-06-15 09:59:13 -05:00
rallytime
33905fd520
Disable new part of test_exit_status_correct_usage test for now
...
This new part of the test_exit_status_correct_usage test was added
in PR #41382 . This test, along with some memory leakage for the
test running in Python 3, has exposed an underlying issue with
Minion._thread_return subprocessing in the test suite. Due to this
issue, this test is extremely flaky.
Per @DmitryKuzmenko's recomendation in https://github.com/saltstack/salt-jenkins/issues/378 ,
this test should be commented out for the time being. He is planning
on coming back to this issue to uncomment the test once the underlying
problem has been resolved.
2017-06-15 08:44:34 -06:00
Mircea Ulinic
db255d3702
Add new term field for capirca Term class
2017-06-15 11:50:08 +00:00
Michel Nederlof
12eb139163
Fix routes for vlan interfaces under debian/ubuntu
...
Whenever a file has a . in the filename (for example when adding
routes for bond0.1332 interface, it would then be route-bond0.1332)
the route file is skipped. By changing the dots in the iface name
for underscores, it is properly executed and handled and routes
are also added for vlan interfaces.
Ubuntu runs all files in the /etc/network/if-up.d directory with a
matching pattern like ^[a-zA-Z0-9_-]+$, using run-parts
2017-06-15 09:37:45 +02:00
garethgreenaway
32a996bdbd
Merge branch 'develop' into 41667_adding_additional_options
2017-06-14 16:21:35 -07:00
