Commit Graph

92 Commits

Author SHA1 Message Date
Ch3LL
f193f0f2ec
Update Issue Template: questions removed 2019-05-08 13:16:50 +01:00
Gareth J. Greenaway
1b4d398579
Merge branch '2018.3' into fluorine
Conflicts:
	salt/modules/acme.py
2018-12-05 21:54:14 +01:00
Gareth J. Greenaway
fde8db5ef4
Merge branch '2017.7' into merge-2017.7
Conflicts:
	tests/support/case.py
2018-12-04 15:53:04 +01:00
Ch3LL
d46aff05fc
Merge branch 2017.7 into 2018.3
Conflicts:
  - salt/modules/file.py
2018-11-29 13:09:15 -05:00
Damon Atkins
b6d1605f99 ci/lint corrected filenames and test condition on full lint
Also fix CODEOWNER team name
2018-11-29 23:44:11 +11:00
Damon Atkins
2d1f51ce84 Fix lint only changes, full lint on merge forwards
- lint only changes previous diff picked up out of data files, when the branch was out of date.
- full limit on merge forward to pick up changes in the lint checks between versions.
- update CODEOWNERS for .ci/*
2018-11-22 20:15:08 +11:00
rallytime
f6943f0241
Merge branch '2018.3' into 'fluorine'
No conflicts.
2018-09-10 09:01:27 -04:00
rallytime
49afc328b5
Merge branch '2018.3' into 'fluorine'
Conflicts:
  - .github/CODEOWNERS
2018-09-07 16:21:13 -04:00
rallytime
a00aba9192
Merge branch '2017.7' into '2018.3'
No conflicts.
2018-09-07 16:19:19 -04:00
rallytime
4b257d298a
Remove duplicate comment in CODEOWNERS file 2018-09-06 16:55:16 -04:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3'
Conflicts:
  - requirements/opt.txt
  - requirements/tests.txt
  - salt/modules/win_service.py
  - tests/integration/states/test_service.py
2018-09-06 12:08:01 -04:00
rallytime
1faab8bc01
Add some files to the CODEOWNERS files for team-core to own
And also fix a couple of bugs found when writing tests for the matching used
by tamarack bot. This expands the files that the core team will be requested for
on pull request reviews.
2018-09-05 09:56:07 -04:00
rallytime
45fc2269cd
Reduce the number of days an issue is stale by 10 2018-08-03 09:30:57 -04:00
rallytime
13d0a7cea8
Reduce the number of days an issue is stale by 10 2018-07-27 09:43:20 -04:00
rallytime
97cc563f13
Reduce the number of days an issue is stale by 10 2018-07-20 12:38:53 -04:00
rallytime
da97b96e10
Reduce the number of days an issue is stale by 10 2018-07-13 13:29:50 -04:00
rallytime
0a814271dd
Reduce the number of days an issue is stale by 10 2018-07-06 10:22:58 -04:00
rallytime
b55aa5b946
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/netapi/rest_tornado/saltnado.py
2018-07-03 16:07:46 -04:00
rallytime
9e42ea0683
Add RCFS directory to team-core review list
Any additions/changes to the files in the `rfcs` directory should be
reviewed by `@saltstack/team-core`.
2018-07-03 14:26:22 -04:00
rallytime
c4fd2a0930
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/rabbitmq.py
  - tests/integration/modules/test_pip.py
2018-06-30 09:33:21 -04:00
rallytime
172e4bda22
Reduce the number of days an issue is stale by 10 2018-06-29 11:01:19 -04:00
rallytime
5e56615e00
Trigger review requests for team-ssh for roster files 2018-06-26 17:58:57 -04:00
rallytime
b7538996c4
Reduce the number of days an issue is stale by 10 2018-06-22 12:00:15 -04:00
rallytime
d3257f2b0b
Reduce the number of days an issue is stale by 10 2018-06-15 10:57:18 -04:00
rallytime
8ece87778e
Reduce the number of days an issue is stale by 10 2018-06-08 10:08:38 -04:00
rallytime
4f8a2e944d
Reduce the number of days an issue is stale by 10 2018-06-01 15:16:03 -04:00
rallytime
583f25cfbd
Reduce the number of days an issue is stale by 10 2018-05-25 10:28:43 -04:00
rallytime
b7d80ff771
Reduce the number of days an issue is stale by 10 2018-05-07 14:03:41 -04:00
rallytime
bd184a257f
Merge branch '2018.3' into 'develop'
Conflicts:
  - tests/unit/grains/test_core.py
2018-05-02 15:28:21 -04:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3'
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
2018-04-27 13:38:35 -04:00
rallytime
542cb6abcc
Reduce the number of days an issue is stale by 10 2018-04-27 09:58:23 -04:00
rallytime
9445af0185
Add windows tests and reg module/state to CODEOWNERS file for team-windows
`team-windows` should be requested for reviews whenever a windows test file
or the reg.py execution module and accompanying reg.py state file are edited.
2018-04-24 10:32:51 -04:00
rallytime
204b6af92b
Fix the matching patterns in the CODEOWNERS file to use fnmatch patterns
The CODEOWNERS file documentation for GitHub says they use a .gitignore-style
file matching pattern. However, since [tamarack](https://github.com/rallytime/tamarack)
is doing the actual team review requesting work, it uses Python's fnmatch lib.

This PR updates some of the file matching patterns to use fnmatch more specifically
and will improve the review requests to be more accurate and increase the number
of automatic team review requests.
2018-04-23 15:40:08 -04:00
rallytime
c1cf20bf93
Reduce the number of days an issue is stale by 10 2018-04-20 10:58:47 -04:00
rallytime
07bca96afc
Reduce the number of days an issue is stale by 10 2018-04-13 10:48:51 -04:00
rallytime
5a7c811d46
Reduce the number of days an issue is stale by 10 2018-04-06 15:57:21 -04:00
rallytime
a0dda1f45c
Reduce the number of days an issue is stale by 10 2018-03-29 11:11:49 -04:00
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop'
Conflicts:
  - salt/modules/kubernetes.py
  - salt/states/netconfig.py
  - salt/states/zfs.py
  - tests/integration/cloud/providers/test_profitbricks.py
  - tests/integration/scheduler/test_eval.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
2018-03-27 11:57:29 -04:00
rallytime
0007934325
Reduce the number of days an issue is stale by 10 2018-03-16 15:19:31 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3'
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
2018-03-15 17:22:05 -04:00
rallytime
bbd566a52b
Reduce the number of days an issue is stale by 10 2018-03-09 16:00:01 -05:00
rallytime
13a295a3b7
Add *pkg* and *snapper* to team-suse
Since *pkg* was specified, we don't specifially need *yumpkg* anymore.
2018-02-28 09:58:46 -05:00
rallytime
35c7b7b0d3
Add btrfs, xfs, yumpkg, and kubernetes file to team-suse 2018-02-27 13:53:43 -05:00
rallytime
b97eafc85e
Reduce the number of days an issue is stale by 10 2018-02-23 14:06:25 -05:00
rallytime
485d777ac0
Add team-suse to CODEOWNERS file for zypper files
This addition will enable automatic reviews from team-suse for PRs that touch
the zypper files.
2018-02-23 09:58:31 -05:00
rallytime
dec24ae9bd
Reduce the number of days an issue is stale by 10 2018-02-16 12:59:49 -05:00
rallytime
0202be8b8f
Reduce the number of days an issue is stale by 10 2018-02-06 10:51:59 -05:00
rallytime
5c48b175cc
Reduce the number of days an issue is stale by 10 2018-01-19 10:19:37 -05:00
rallytime
96d36b8056
Reduce the number of days an issue is stale by 10 2018-01-05 17:27:18 -05:00
rallytime
d9c23ef6df
Reduce the number of days an issue is stale by 10 2017-12-22 16:52:19 -05:00