78ac53851f
Merge pull request #1125 from github/release-3.6.3
...
Bump version: 3.6.3
2023-10-02 13:20:01 -07:00
7ec23a6f22
Bump version: 3.6.3 [ci skip]
2023-10-02 20:19:56 +00:00
bb7297df95
Merge pull request #1120 from github/3.6.3-patch
...
3.6.3 patch
2023-10-02 12:58:15 -07:00
4e2e1d1855
Merge pull request #622 from github/enterprise-3.6-backport-568-543-workflow-build-release-part-2
...
Backport 568 for 3.6: Build and Release Workflow Part 2
2023-09-27 12:56:40 -05:00
1e59344402
Manual backport of #568 - resolved conflict
2023-09-27 08:47:01 -04:00
b311ae79fe
Merge pull request #568 from github/543-workflow-build-release-part-2
...
Build and Release Workflow Part 2
2023-09-27 08:46:15 -04:00
9412741b24
Merge pull request #571 from github/enterprise-3.6-backport-492-add-host-online-check
...
Backport 492 for 3.6: Adding host online check
2023-09-12 10:15:27 -07:00
4f7f452929
Merge branch 'enterprise-3.6-release' into enterprise-3.6-backport-492-add-host-online-check
2023-09-12 09:50:20 -07:00
0824a8068c
Manual backport of #492 - resolved conflict
2023-09-12 10:16:39 +02:00
a3b7ad47a6
Merge pull request #549 from github/enterprise-3.6-backport-527-pluehne/find-parallel-in-more-locations
...
Backport 527 for 3.6: Find parallel in more locations
2023-09-06 11:45:08 -07:00
88eb072574
Merge pull request #527 from github/pluehne/find-parallel-in-more-locations
...
Find parallel in more locations
2023-08-31 21:36:34 +00:00
9cd2f7d5dc
Merge pull request #538 from github/3.6.2-patch
...
3.6.2 patch sync
2023-08-28 16:45:13 -07:00
3dab72cbd0
Merge pull request #1102 from github/release-3.6.2
...
Bump version: 3.6.2
2023-08-16 16:10:00 -07:00
b290e07701
Bump version: 3.6.2 [ci skip]
2023-08-16 23:09:56 +00:00
3ae33066a7
Merge pull request #1098 from github/3.6.2-patch
...
3.6.2 patch
2023-08-16 16:06:02 -07:00
5d245e2506
Merge remote-tracking branch 'private/enterprise-3.6-release' into 3.6.2-patch
2023-08-16 22:51:00 +00:00
0ce1afee27
Merge pull request #501 from github/enterprise-3.6-backport-499-shellcheck-stable
...
Backport 499 for 3.6: Change shellcheck to use stable, not latest
2023-08-16 14:55:04 -07:00
c5c4a798a2
Merge pull request #499 from github/shellcheck-stable
...
Change shellcheck to use stable, not latest
2023-08-16 21:35:30 +00:00
7185a8f522
Merge remote-tracking branch 'private/enterprise-3.6-release' into 3.6.2-patch
2023-08-16 19:32:24 +00:00
ccd6cefc1d
Merge pull request #494 from github/enterprise-3.6-backport-conditional-publish
...
Backport 491 for 3.6: Leave release in draft state by default
2023-08-15 13:34:45 -07:00
f98d6337a4
Leave releases as draft
2023-08-15 12:06:23 -07:00
e90e4f333f
Merge pull request #439 from github/enterprise-3.6-backport-318-eptekov-pages-lazybuild
...
Backport 318 for 3.6: Adding new option to support Pages lazy-build strategy
2023-08-08 10:23:03 -04:00
7a9d4b67c4
Merge pull request #433 from github/enterprise-3.6-backport-378-fix-es-translog-setting
...
Backport 378 for 3.6: Replace deprecated translog flush setting in ES
2023-08-07 09:56:43 -04:00
929b3a8c04
Merge pull request #1074 from github/release-3.6.1
...
Bump version: 3.6.1
2023-07-20 18:05:37 -07:00
d679c41f7a
Bump version: 3.6.1 [ci skip]
2023-07-21 01:05:34 +00:00
cf128c5dc6
Merge pull request #1072 from github/3.6.1-patch
...
3.6.1 patch
2023-07-20 17:43:55 -07:00
2a0d023d75
Manual backport of #318 - resolved conflict
2023-07-19 11:53:23 -07:00
f3b141d5a6
Merge pull request #378 from github/fix-es-translog-setting
...
Replace deprecated translog flush setting in ES
2023-07-19 18:37:56 +00:00
54fafea212
Merge pull request #428 from github/enterprise-3.6-backport-354-adjust-release-script-to-support-patch-version
...
Backport 354 for 3.6: Adjusting backup-utils Release Script To Support Patch Versions
2023-07-19 10:22:34 -07:00
aa4cc3a05f
Merge pull request #354 from github/adjust-release-script-to-support-patch-version
...
Adjusting backup-utils Release Script To Support Patch Versions
2023-07-19 17:17:44 +00:00
4d45408d37
Merge pull request #419 from github/enterprise-3.6-backport-348-users/boxofyellow/2023-06/mssql-backup_0
...
Backport 348 for 3.6: Allow the caller to handle setting failures
2023-07-19 09:18:18 -07:00
f84b602bf0
Merge pull request #348 from github/users/boxofyellow/2023-06/mssql-backup_0
...
Allow the caller to handle setting failures
2023-07-19 08:49:17 -07:00
5824660688
Merge pull request #415 from github/enterprise-3.6-backport-331-add-encrypted-column-keys
...
Backport 331 for 3.6: Add encrypted column encryption keys to backup utils
2023-07-19 08:17:39 -07:00
51d6c96b2a
Fix tests using commits from #338
2023-07-18 19:04:00 -07:00
f5a0699cbf
Merge pull request #331 from github/add-encrypted-column-keys
...
Add encrypted column encryption keys to backup utils
2023-07-18 18:58:07 -07:00
cbb7d75097
Merge pull request #411 from github/enterprise-3.6-backport-312-djdefi-host-info
...
Backport 312 for 3.6: Capture backup host info in backup output
2023-07-18 18:27:13 -07:00
81a7c1c9a9
Merge pull request #312 from github/djdefi-host-info
...
Capture backup host info in backup output
2023-07-19 00:48:28 +00:00
3376a0da97
Merge pull request #950 from github/release-3.6.0
...
Bump version: 3.6.0
2022-08-17 14:20:58 -05:00
f83c3eaa12
Bump version: 3.6.0 [ci skip]
2022-08-17 19:20:54 +00:00
380864ab0a
Merge pull request #941 from github/djdefi-checkoutv3
2022-08-08 08:06:28 -07:00
3804422592
Merge branch 'master' into djdefi-checkoutv3
2022-08-08 07:55:10 -07:00
079e1cceec
Stop restore when a backup without Actions is being restored onto an appliance with Actions enabled ( #946 )
...
* throw error and abort when restoring a backup with Actions disabled onto an appliance with Actions enabled
* set ACTIONS_ENABLED_IN_BACKUP to false if the value is not found in settings.json
* use git config to grab app.actions.enabled directly
* add bash function to enable and disable actions in settings.json
* enable actions in settings for part of other tests that require it
* use git config to set initial value for actions in settings.json
* empty settings.json before using git config
2022-08-08 09:16:01 +02:00
a8849d24c5
Merge branch 'master' into djdefi-checkoutv3
2022-08-05 12:30:40 -07:00
3e4b93aebb
Add token per linter docs
2022-08-05 10:22:40 -07:00
72857dcfcc
Full history for linter
2022-08-05 10:13:16 -07:00
d3125df10d
Lint PRs
2022-08-05 09:57:42 -07:00
261bd7c394
Merge pull request #942 from github/djdefi-dependabot
2022-08-05 08:12:04 -07:00
2c6eee1c0c
Merge branch 'master' into djdefi-dependabot
2022-08-05 08:00:31 -07:00
bcaffea976
Merge pull request #940 from github/djdefi-docker-bullseye
2022-08-05 07:59:55 -07:00
5a1ae80adb
Merge branch 'master' into djdefi-docker-bullseye
2022-08-04 09:41:53 -07:00
Devin Dooley
Tim Reimherr
Tim Reimherr
Tony Truong
Patrick Lühne
Chuck Pathanjali
Peter Kovacs
Ant Kaynak
Joseph Franks
boxofyellow
Kylie Stradley
djdefi
djdefi
Luca Cavallin