valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,030 Commits 24 Branches 182 Tags 341 MiB
0ca7539e21
Commit Graph

83030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neile Havens
0ca7539e21 Merge branch 'develop' into develop 2017-06-19 07:13:36 -05: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
Neile Havens
4491722a80 Fix yum repo file comments to work as documented in pkgrepo.managed 2017-06-17 15:30:48 -05:00
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
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
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
d41c4ab45b Merge branch 'develop' into 41667_adding_additional_options 2017-06-15 15:54:30 -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
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
rallytime
7fef4cf38f Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
 2017-06-15 10:57:27 -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
Mike Place
c2fd11648e Newline for lint 2017-06-14 16:19:45 -06:00
Mike Place
16d9abcd18 Merge pull request #41752 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-06-14 17:16:03 -05:00
Nicole Thomas
b26542efe3 Merge pull request #41751 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-14 16:14:54 -06:00
Mike Place
e932f43bbf Merge pull request #41687 from garethgreenaway/41618_runner_return_event_bad_function 
Return an event when salt runner has an Salt exception
 2017-06-14 16:55:36 -05:00
Nicole Thomas
a224990abe Lint: Add extra blank line 2017-06-14 15:37:50 -06:00
joelc
a9b0cf7965 Adds get_tags method 2017-06-14 15:14:44 -05:00
rallytime
d7ecd3c149 Merge branch '2017.7' into 'develop' 
No conflicts.
 2017-06-14 13:35:50 -06:00
rallytime
65cf36f607 Use salt.utils.versions file for LooseVersion in 2017.7 2017-06-14 13:34:34 -06:00
rallytime
16a2747d7d Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/buildenv/salt.bat
  - salt/modules/pillar.py
  - salt/utils/openstack/nova.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
  - tests/unit/cloud/clouds/test_gce.py
 2017-06-14 13:31:42 -06:00
garethgreenaway
edcafc6a26 Merge pull request #41692 from rallytime/fix-40155 
Add boto and boto3 version dependencies to boto_vpc state docs
 2017-06-14 12:05:06 -07:00
Mike Place
afa01f0cc9 Merge pull request #41744 from twangboy/docs_win_add_firewall 
Add instructions for Opening Windows Firewall for Salt
 2017-06-14 13:53:07 -05:00
Erik Johnson
f1d7eb4166 Add comparison operator feature to Oxygen release notes 2017-06-14 13:47:49 -05:00
Erik Johnson
6a81030745 jmespath is a dep of boto3, include it in boto3 import attempt 2017-06-14 13:41:07 -05:00
Erik Johnson
bdaeb55a77 Merge pull request #40902 from lorengordon/pillar-get-merge-lists 
Removes duplicates when merging pillar lists and adds pillar.get override for pillar_merge_lists
 2017-06-14 13:39:08 -05:00
Erik Johnson
226f226392 Update documentation for comparison operators in pkg.installed state 2017-06-14 13:27:29 -05:00
Erik Johnson
a268227883 Use salt.utils.pkg.split_comparison in pkg states 2017-06-14 13:24:33 -05:00
Erik Johnson
444e45b8e8 Add support for comparison operators to pkg.install (yum/dnf, apt) 2017-06-14 13:21:02 -05:00
rallytime
2b51a20d02 Replace "nitrogen" references with 2017.7.0, too! 2017-06-14 12:20:45 -06:00