-
Notifications
You must be signed in to change notification settings - Fork 244
Changes From 8.2.5 To 8.2.6
Thomas Carmet edited this page Apr 14, 2020
·
1 revision
- Merge branch 'w/8.1/feature/S3C-2729-arsenal-update-for-7.7' into tmp/octopus/w/8.2/feature/S3C-2729-arsenal-update-for-7.7
- Merge branch 'feature/S3C-2729-arsenal-update-for-7.7' into tmp/octopus/w/8.1/feature/S3C-2729-arsenal-update-for-7.7
- Merge branch 'development/7.7' into feature/S3C-2729-arsenal-update-for-7.7
- Merge branches 'development/8.2' and 'w/8.1/feature/S3C-2729-arsenal-update-for-7.7' into tmp/octopus/w/8.2/feature/S3C-2729-arsenal-update-for-7.7
- Merge branch 'development/8.1' into w/8.1/feature/S3C-2729-arsenal-update-for-7.7
- Merge branch 'w/8.1/bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes' into tmp/octopus/w/8.2/bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes
- Merge remote-tracking branch 'origin/w/7.7/bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes' into w/8.1/bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes
- Merge branch 'bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes' into tmp/octopus/w/7.6/bugfix/S3C-2542_add_default_logger_fields_for_backbeat_routes
- Merge branch 'w/8.1/bugfix/S3C-2756_update_pykmip_ci_certificates' into tmp/octopus/w/8.2/bugfix/S3C-2756_update_pykmip_ci_certificates
- Merge branch 'w/7.7/bugfix/S3C-2756_update_pykmip_ci_certificates' into tmp/octopus/w/8.1/bugfix/S3C-2756_update_pykmip_ci_certificates
- bf(S3C-2756): Update pykmip certificates used in CI
- Merge branch 'w/8.1/feature/S3C-2729-arsenal-update-for-7.7' into tmp/octopus/w/8.2/feature/S3C-2729-arsenal-update-for-7.7
- Fix arsenal version for 8.1
- Merge branch 'w/8.1/feature/S3C-2729-arsenal-update-for-7.7' into tmp/octopus/w/8.2/feature/S3C-2729-arsenal-update-for-7.7
- Merge remote-tracking branch 'origin/feature/S3C-2729-arsenal-update-for-7.7' into w/8.1/feature/S3C-2729-arsenal-update-for-7.7
- bf(S3C-2542): add default logger fields for backbeat routes
- feature/S3C-2729: update arsenal dependency version
- Merge branch 'w/8.1/bugfix/S3C-2714-fix-permissions' into tmp/octopus/w/8.2/bugfix/S3C-2714-fix-permissions
- Merge branch 'w/7.7/bugfix/S3C-2714-fix-permissions' into tmp/octopus/w/8.1/bugfix/S3C-2714-fix-permissions
- Merge branch 'bugfix/S3C-2714-fix-permissions' into tmp/octopus/w/7.6/bugfix/S3C-2714-fix-permissions
- bf: S3C 2714 update permissions tests for no bucketOwnerActions
- bf: S3C 2714 remove 'bucketOwnerAction' from bucket perms and fix obj logic
- Merge branch 'bugfix/ZENKO-1670-propagate-updates-if-master-version-is-gte' into tmp/octopus/w/8.2/bugfix/ZENKO-1670-propagate-updates-if-master-version-is-gte
- bugfix: ZENKO-1670-propagate-updates-if-master-version
- Merge branch 'w/8.1/bugfix/S3C-2697-acl-perms-regression' into tmp/octopus/w/8.2/bugfix/S3C-2697-acl-perms-regression
- Merge remote-tracking branch 'origin/w/7.7/bugfix/S3C-2697-acl-perms-regression' into w/8.1/bugfix/S3C-2697-acl-perms-regression
- Merge branch 'bugfix/S3C-2697-acl-perms-regression' into tmp/octopus/w/7.6/bugfix/S3C-2697-acl-perms-regression
- bf: S3C-2697 acl permissions regression
- Merge branch 'bugfix/ZENKO-2352-httpError424IfLocationDoesNotExist' into tmp/octopus/w/8.2/bugfix/ZENKO-2352-httpError424IfLocationDoesNotExist
- bugfix: ZENKO-2352 arsenal dependency update
- Merge branches 'w/8.2/bugfix/S3C-2502-vault-req-ip-header-port' and 'q/2378/8.1/bugfix/S3C-2502-vault-req-ip-header-port' into tmp/octopus/q/8.2
- Merge branches 'w/8.1/bugfix/S3C-2502-vault-req-ip-header-port' and 'q/2378/7.7/bugfix/S3C-2502-vault-req-ip-header-port' into tmp/octopus/q/8.1
- Merge branches 'w/7.6/bugfix/S3C-2502-vault-req-ip-header-port' and 'q/2378/7.6.0/bugfix/S3C-2502-vault-req-ip-header-port' into tmp/octopus/q/7.6
- Merge branch 'bugfix/S3C-2502-vault-req-ip-header-port' into q/7.6.0
- Merge branch 'w/8.1/bugfix/S3C-2502-vault-req-ip-header-port' into tmp/octopus/w/8.2/bugfix/S3C-2502-vault-req-ip-header-port
- Merge remote-tracking branch 'origin/w/7.7/bugfix/S3C-2502-vault-req-ip-header-port' into w/8.1/bugfix/S3C-2502-vault-req-ip-header-port
- Merge remote-tracking branch 'origin/bugfix/S3C-2502-vault-req-ip-header-port' into w/7.6/bugfix/S3C-2502-vault-req-ip-header-port
- Merge branches 'w/8.2/bugfix/S3C-2544-diff-acct-metrics-port-2' and 'q/2363/8.1/bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/q/8.2
- Merge branches 'w/8.1/bugfix/S3C-2544-diff-acct-metrics-port-2' and 'q/2363/7.7/bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/q/8.1
- Merge branch 'bugfix/S3C-2544-diff-acct-metrics-port-2' into q/7.6.0
- Merge branches 'w/7.6/bugfix/S3C-2544-diff-acct-metrics-port-2' and 'q/2363/7.6.0/bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/q/7.6
- bf: S3C 2502 move ip util to arsenal
- Merge branches 'w/8.2/bugfix/S3C-2597-bucket-policy-can-id-port' and 'q/2368/8.1/bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/q/8.2
- Merge branches 'w/8.1/bugfix/S3C-2597-bucket-policy-can-id-port' and 'q/2368/7.7/bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/q/8.1
- Merge branch 'w/7.6/bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/q/7.6
- Merge branch 'w/8.1/bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/w/8.2/bugfix/S3C-2597-bucket-policy-can-id-port
- Merge branch 'w/7.7/bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/w/8.1/bugfix/S3C-2597-bucket-policy-can-id-port
- Merge branch 'bugfix/S3C-2597-bucket-policy-can-id-port' into tmp/octopus/w/7.6/bugfix/S3C-2597-bucket-policy-can-id-port
- S3C-2597-bucket-policy-can-id
- Merge branch 'w/8.1/bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/w/8.2/bugfix/S3C-2544-diff-acct-metrics-port-2
- Merge branch 'w/7.7/bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/w/8.1/bugfix/S3C-2544-diff-acct-metrics-port-2
- Merge branch 'bugfix/S3C-2544-diff-acct-metrics-port-2' into tmp/octopus/w/7.6/bugfix/S3C-2544-diff-acct-metrics-port-2
- bf: S3C-2544 fix metric handling on put/del obj
- Merge branches 'w/8.2/bugfix/S3C-2502-vault-req-ip-header' and 'q/2333/8.1/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/q/8.2
- Merge branches 'w/8.1/bugfix/S3C-2502-vault-req-ip-header' and 'q/2333/7.7/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/q/8.1
- Merge branch 'bugfix/S3C-2502-vault-req-ip-header' into q/7.4
- Merge branches 'w/7.6/bugfix/S3C-2502-vault-req-ip-header' and 'q/2333/7.4/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/q/7.6
- Merge branches 'development/8.2' and 'w/8.1/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/w/8.2/bugfix/S3C-2502-vault-req-ip-header
- Merge branch 'w/7.7/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/w/8.1/bugfix/S3C-2502-vault-req-ip-header
- Merge branch 'development/7.6' into tmp/octopus/w/7.6/bugfix/S3C-2502-vault-req-ip-header
- Merge remote-tracking branch 'origin/w/7.7/bugfix/S3C-2502-vault-req-ip-header' into w/8.1/bugfix/S3C-2502-vault-req-ip-header
- Merge remote-tracking branch 'origin/development/8.1' into w/8.1/bugfix/S3C-2502-vault-req-ip-header
- fix arsenal version
- fix arsenal version
- fix arsenal version
- Merge branch 'w/8.1/bugfix/S3C-2502-vault-req-ip-header' into tmp/octopus/w/8.2/bugfix/S3C-2502-vault-req-ip-header
- Merge remote-tracking branch 'origin/w/7.7/bugfix/S3C-2502-vault-req-ip-header' into w/8.1/bugfix/S3C-2502-vault-req-ip-header
- Merge remote-tracking branch 'origin/bugfix/S3C-2502-vault-req-ip-header' into w/7.6/bugfix/S3C-2502-vault-req-ip-header
- bf: S3C 2502 move ip util to arsenal