Commit Graph

58 Commits

Author SHA1 Message Date
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
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
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
5e56615e00
Trigger review requests for team-ssh for roster files 2018-06-26 17:58:57 -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
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
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
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
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
3f9bf00c15
Reduce the number of days an issue is stale by 15 2017-12-01 15:09:14 -05:00
rallytime
cc99cb61b9
Reduce the number of days an issue is stale by 15 2017-11-17 15:31:48 -05:00
rallytime
caa0c54e9a
Reduce the number of days an issue is stale by 10 2017-11-10 11:24:42 -05:00
rallytime
1104838aa4
Reduce the number of days an issue is stale by 10 2017-11-05 21:05:40 -07:00
rallytime
09d0a347c5
Reduce the number of days an issue is stale by 15 2017-10-27 09:48:08 -04:00
Erik Johnson
96891a062a Merge pull request #44203 from rallytime/merge-develop
[develop] Merge forward from 2017.7 to develop
2017-10-23 09:11:54 -05:00
rallytime
9da66a2bb9
Reduce the number of days an issue is stale by 25 2017-10-20 10:53:11 -04:00
rallytime
2617cf851f
Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/modules/aptpkg.py
  - salt/utils/win_functions.py
  - tests/unit/states/test_mount.py
2017-10-20 10:44:29 -04:00
rallytime
6aa8f03a4a
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/states/blockdev.py
  - tests/unit/states/test_blockdev.py
2017-10-18 09:31:39 -04:00
Mike Place
e41e3d76be Typo fix 2017-10-16 13:00:11 -06:00
Mike Place
37c7980880
Add note about GPG signing to PR template 2017-10-16 10:03:02 -06:00
rallytime
7d21d4253a
Reduce the number of days an issue is stale by 25 2017-10-16 10:30:45 -04:00
rallytime
e0d3028bb0
Reduce the number of days an issue is stale by 25 2017-09-29 14:25:18 -04:00
rallytime
100113726c
Reduce the number of days an issue is stale by 30 2017-09-21 13:18:07 -04:00
rallytime
eb91a073d8 Reduce the number of days an issue is stale by 30 2017-09-11 12:12:33 -04:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop'
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
2017-09-06 09:39:27 -04:00
rallytime
efef4f6a9b Reduce the number of days an issue is stale by 15 2017-09-01 17:05:16 -04:00
rallytime
b1062f8c15 Merge branch '2016.11' into '2017.7'
No conflicts.
2017-09-01 16:21:34 -04:00
rallytime
2b4da0f0e7 Add CODEOWNERS file 2017-08-31 09:28:47 -04:00
rallytime
a8b786d0f2 Reduce the number of days an issue is stale by 25 2017-08-28 09:38:37 -04:00
rallytime
361530f3d0 Reduce the number of days an issue is stale by 15 2017-08-18 17:05:36 -04:00
rallytime
3136050177 Reduce the number of days an issue is stale by 15 2017-08-14 17:08:05 -04:00
rallytime
64ae7e4475 Reduce the number of days an issue is stale by 15 2017-07-28 11:09:14 -06:00
rallytime
4a3e89473c Reduce the number of days an issue is stale by 15 2017-07-21 09:34:51 -06:00
rallytime
9e9f781779 Reduce the number of days an issue is stale by 15
We're still within the 3 years and 2 months range. I opted to only
reduce this number by 15 instead of 25 because this change will mark
18 issues as stale rather than about 35.

We need to keep reducing this number, but we also don't want to flood
this process too much.
2017-07-14 11:18:50 -06:00
rallytime
06a153368d Reduce the number of days an issue is stale by 25
This reduces the amount of time an issue is stale to approximately
a little less than 3 years and 2 months.
2017-07-05 15:55:00 -06:00
rallytime
42989d5a28 Reduce the number of days an issue is stale by 25
This reduces the amount of time an issue is stale to approximately
3 years, 3 months, and some change.
2017-06-19 17:29:44 -06:00
rallytime
1601badeaa Reduce the number of days an issue is stale by 25
As we ease into a more reasonable `daysUntilStale` value, this
updates the time an issue will be marked as stale to about 3 years
and 4 months.
2017-06-09 12:39:32 -06:00
rallytime
c7260b4de5 Reduce the number of days an issue is stale by 25
Let's ease into a more reasonable `daysUntilStale` value. This
updates the time an issue will be marked as stale to about 3 years
and 5 months.
2017-06-02 09:53:50 -06:00
rallytime
3e75628f87 Add probot-stale config file for the salt repo
This config file enables the [probot-stale](https://github.com/probot/stale/)
bot to comment on stale issues. We're starting off with issues
that have become stale after approximately 3 years and 6 months.
This value is configured in the `daysUntilStale` setting.
2017-05-12 17:31:39 -06:00
rallytime
2771550470 Change .rst syntax to .md syntax 2017-03-13 17:14:50 -06:00
rallytime
dfaddea749 Renamed .github/CONTRIBUTING.rst -> .github/CONTRIBUTING.md 2017-03-13 15:33:07 -06:00
Daniel Wallace
ad3a72388d clean up HACKING.rst doc
Also fix a spelling mistake in .github/contributing.rst
2016-11-03 16:47:59 -05:00