Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge testing branch into master #15 #16

Merged
merged 21 commits into from
May 30, 2023
Merged

Commits on Feb 20, 2023

  1. 4.5.7-0 spec file - testing channel release

    Our stable package is to be built from master, but
    we are as-yet still in Release Candidate (RC4) stage
    in rockstor-core, so commit spec to testing here for
    now until we reach our 'First Stable Poetry build'
    GitHub milestone in rockstor-core. There-after we
    maintain both master and testing for Stable and Testing
    update channel package releases, respectively. At that
    point all prior testing branch updates will have already
    been merged into master here and in rockstor-core such
    that both master and testing from that point on share
    the same Poetry based build system.
    phillxnet committed Feb 20, 2023
    Configuration menu
    Copy the full SHA
    373cb49 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#1 from phillxnet/testing

    4.5.7-0 spec file - testing channel release
    phillxnet authored Feb 20, 2023
    Configuration menu
    Copy the full SHA
    999cf99 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Add README.md with rpm-build instructions rockstor#2

    Initial draft of developer focused About/Howto README.md.
    Intended to enable contributors to do DIY RPM builds
    for end-to-end testing of proposed changes in related
    repositories. Based on using the official Rockstor
    installer to promote self-hosting capabilities.
    phillxnet committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    5b7140c View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. README.md typo hyphen

    Co-authored-by: Hooverdan96 <35113775+Hooverdan96@users.noreply.github.com>
    phillxnet and Hooverdan96 authored Feb 22, 2023
    Configuration menu
    Copy the full SHA
    4bb6d2f View commit details
    Browse the repository at this point in the history
  2. README.md typo re wrong it's use yet again

    Co-authored-by: Hooverdan96 <35113775+Hooverdan96@users.noreply.github.com>
    phillxnet and Hooverdan96 authored Feb 22, 2023
    Configuration menu
    Copy the full SHA
    1ab0c4d View commit details
    Browse the repository at this point in the history
  3. README.md typo spelling

    Co-authored-by: Hooverdan96 <35113775+Hooverdan96@users.noreply.github.com>
    phillxnet and Hooverdan96 authored Feb 22, 2023
    Configuration menu
    Copy the full SHA
    3428d3e View commit details
    Browse the repository at this point in the history
  4. README.md grammar improvement

    Co-authored-by: Hooverdan96 <35113775+Hooverdan96@users.noreply.github.com>
    phillxnet and Hooverdan96 authored Feb 22, 2023
    Configuration menu
    Copy the full SHA
    4ce08c6 View commit details
    Browse the repository at this point in the history
  5. Merge pull request rockstor#3 from phillxnet/2_Add_README.md_with_rpm…

    …_build_instructions_using_official_installer
    
    Add README.md with rpm-build instructions rockstor#2
    phillxnet authored Feb 22, 2023
    Configuration menu
    Copy the full SHA
    db927b0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f4aeb67 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Implement suggestions.

    Hooverdan96 authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    4e1544d View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#5 from Hooverdan96/readme---updates

    Readme.md: Minor adjustments/corrections rockstor#4
    phillxnet authored Feb 23, 2023
    Configuration menu
    Copy the full SHA
    cdab5f7 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Ongoing changelog for 4.5.8-0 part1 rockstor#6

    Modify changelog re progress using release version
    to denote the next GitHub PR to be test built with
    the indicated changes.
    phillxnet committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    99cb221 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#7 from phillxnet/6_Ongoing_changelog_for_…

    …4.5.8-0_par1
    
    Ongoing changelog for 4.5.8-0 part1 rockstor#6
    phillxnet authored Mar 6, 2023
    Configuration menu
    Copy the full SHA
    08ebd6c View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. Configuration menu
    Copy the full SHA
    643afcf View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#8 from phillxnet/#6_Move_to_4.5.8-0_release

    4.5.8-0 Version-Release plus Changelog update rockstor#6
    phillxnet authored Mar 7, 2023
    Configuration menu
    Copy the full SHA
    f707cc7 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. Configuration menu
    Copy the full SHA
    b8f94a8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#10 from phillxnet/9_Ongoing_changelog_for…

    …_4.5.9-0
    
    4.5.9-0 Version-Release plus Changelog update rockstor#9
    phillxnet authored Apr 28, 2023
    Configuration menu
    Copy the full SHA
    a927e00 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Update changelog on TW aarch64 build fix rockstor#11

    Includes Release increase bump.
    phillxnet committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    4a20377 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#12 from phillxnet/11_Update_changelog_on_…

    …TW_aarch64_build_fix
    
    Update changelog on TW aarch64 build fix rockstor#11
    phillxnet authored Apr 29, 2023
    Configuration menu
    Copy the full SHA
    ec42f38 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. Configuration menu
    Copy the full SHA
    86a8606 View commit details
    Browse the repository at this point in the history
  2. Merge pull request rockstor#14 from phillxnet/13_4.6.0-0_Version-Rele…

    …ase_plus_Changelog_update
    
    4.6.0-0 Version-Release plus Changelog update rockstor#13
    phillxnet authored May 30, 2023
    Configuration menu
    Copy the full SHA
    0c3bd03 View commit details
    Browse the repository at this point in the history