Bump versions to a 4.6.1 base (Stable) - master branch #2615 #2617
+2
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pyproject.toml build.sh
phillxnet
deleted the
2615_Bump_versions_to_a_4.6.1_base_(Stable)_-_master_branch
branch
Hooverdan96
added a commit
to Hooverdan96/rockstor-core
that referenced
this pull request
Oct 3, 2024
commit 4d60a2c Merge: 7051ade 6e08e10 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Wed Jul 12 13:06:48 2023 +0100 Merge pull request rockstor#2617 from phillxnet/2615_Bump_versions_to_a_4.6.1_base_(Stable)_-_master_branch Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615 commit 6e08e10 Author: Philip Guyton <philip@yewtreeapps.com> Date: Wed Jul 12 13:04:14 2023 +0100 Bump versions to a 4.6.1 base (Stable) - master branch rockstor#2615 pyproject.toml build.sh commit 7051ade Merge: 9fdeff3 e3648a8 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Tue Jul 11 17:18:10 2023 +0100 Merge pull request rockstor#2614 from phillxnet/2613_Cherry-pick_-_Update_unit_tests_re_recent_SSL_Cert_update_changes Update unit tests re recent SSL Cert update changes rockstor#2613 commit e3648a8 Author: Philip Guyton <philip@yewtreeapps.com> Date: Tue Jul 11 16:45:55 2023 +0100 Update unit tests re recent SSL Cert update changes rockstor#2611 Move test mocking from superctl to systemctl accordingly. Includes - Commented instructions on running these tests. commit 9fdeff3 Merge: c11c912 6284eb7 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Mon Jul 10 15:34:26 2023 +0100 Merge pull request rockstor#2605 from phillxnet/2566_SSL_Certificate_update_doesn't_restart_nginx SSL Certificate update doesn't reload nginx rockstor#2566 commit 6284eb7 Author: Philip Guyton <philip@yewtreeapps.com> Date: Mon Jul 10 15:17:34 2023 +0100 SSL Certificate update doesn't reload nginx rockstor#2566 Use systemctl wrapper to reload nginx post SSL cert reconfig. From Rockstor v4.5.4-0 onwards nginx is no longer managed by supervisord. # Includes - Nginx reload not restart to avoid Web-UI service interruption and enable confirmation dialog display. commit c11c912 Merge: 65df1a6 ae3f342 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Sun Jul 9 18:28:36 2023 +0100 Merge pull request rockstor#2601 from phillxnet/#2599_Revise_Stable_Updates_activation_instructions_re_legacy_shop_removal Revise Stable Updates activation re legacy shop removal rockstor#2599 commit ae3f342 Author: Philip Guyton <philip@yewtreeapps.com> Date: Sun Jul 9 18:08:49 2023 +0100 Revise Stable Updates activation instructions re legacy shop removal rockstor#2599 Modify our "Activate Stable updates" dialog instructions in accordance with our removal of the now legacy/redundant shop that has now been replaced by Appman's initial integration with our newly established Open Collective. commit 65df1a6 Merge: 1d4b9d5 b496902 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Sun Jul 9 17:46:04 2023 +0100 Merge pull request rockstor#2597 from FroggyFlox/2596_Release_process_changes_in_accompanying_repositories Add GitHub Action to trigger post-release updates across repositories rockstor#2596 commit b496902 Author: FroggyFlox <flox2b@gmail.com> Date: Mon Jul 3 11:24:18 2023 -0400 Add GitHub Action to trigger post-release updates across repositories After each release, we are currently manually performing the required changes and udpates across our repositories. This commit adds a GitHub Action workflow to trigger these changes automatically. commit 1d4b9d5 Merge: 0249f52 46f8cb4 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Tue May 30 17:05:42 2023 +0100 Merge pull request rockstor#2563 from phillxnet/master Merge testing branch into master rockstor#2529 commit 0249f52 Merge: 81a0d5f 15ae137 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Wed Nov 2 17:18:34 2022 +0000 Merge pull request rockstor#2413 from rockstor/2412_configure_Dependabot_against_testing_branch configure Dependabot against testing branch rockstor#2412 commit 15ae137 Author: Philip Guyton <phillxnet@users.noreply.github.com> Date: Mon Oct 31 15:12:36 2022 +0000 configure Dependabot against testing branch rockstor#2412 Begin explicit configuration of GitHub Dependabot, adding a target-branch directive of "testing".
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pyproject.toml build.sh
Fixes #2615