Branch: refs/heads/master Home: https://github.com/yast/yast-packager Commit: 709163c9ad84ad9f60181fd4c61b1bdac258b8c5 https://github.com/yast/yast-packager/commit/709163c9ad84ad9f60181fd4c61b1bd... Author: Ancor Gonzalez Sosa <ancor@suse.de> Date: 2021-01-15 (Fri, 15 Jan 2021) Changed paths: M src/lib/packager/clients/software_proposal.rb Log Message: ----------- Bring back commit 3344dfcd281e963b37 Commit 3344dfcd281e963b37 contained some code adjustments in the file clients/software_proposal.rb related to the introduction of storage-ng. In parallel, commit 6a6b1764feabec3c10 moved that original file to a new location lib/packager/clients/software_proposal.rb As a consequence, when both branches were merged the changes of the former commit got lost and the file still contained the old code without the storage-ng adjustments. Commit: 47296dd994fa87ff024038c606d2fc0c29a31797 https://github.com/yast/yast-packager/commit/47296dd994fa87ff024038c606d2fc0... Author: Ancor Gonzalez Sosa <ancor@suse.de> Date: 2021-01-15 (Fri, 15 Jan 2021) Changed paths: M .github/workflows/ci.yml Log Message: ----------- Use newer version of the Github API for CI Commit: 2c340957e69aa0935081cbfdf4d187213138a03c https://github.com/yast/yast-packager/commit/2c340957e69aa0935081cbfdf4d1872... Author: Ancor Gonzalez Sosa <ancor@suse.de> Date: 2021-01-15 (Fri, 15 Jan 2021) Changed paths: M package/yast2-packager.changes M package/yast2-packager.spec Log Message: ----------- Version and changelog Commit: d9de7ff49486a8fa875f65e6a39b785ab2e78926 https://github.com/yast/yast-packager/commit/d9de7ff49486a8fa875f65e6a39b785... Author: Ancor Gonzalez Sosa <ancor@suse.de> Date: 2021-01-15 (Fri, 15 Jan 2021) Changed paths: M .github/workflows/ci.yml M package/yast2-packager.changes M package/yast2-packager.spec M src/lib/packager/clients/software_proposal.rb Log Message: ----------- Merge pull request #544 from ancorgs/fix_wrong_merge Bring back commit 3344dfcd281e963b37 Compare: https://github.com/yast/yast-packager/compare/806efaa8cde2...d9de7ff49486