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.

Sign up for GitHub

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

Jump to bottom

Fix 0.4.0 merge conflicts #229

Merged
merged 5 commits into from
Aug 29, 2023
Merged

Fix 0.4.0 merge conflicts #229

merged 5 commits into from
Aug 29, 2023

Commits on Aug 21, 2023

  1. Updated catalog-info.yaml file for Backstage (SatelliteQE#227) 

    * Update catalog-info.yaml with name space

* Update catalog-info.yaml
    @rujutashinde
    rujutashinde committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    d785ec3 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Simplify FileLock class implementation 

    This change removes some unnecessary parts of the class to cut out wasted time and hopefuly reduce the chance of hitting a race condition.
    @JacobCallahan
    JacobCallahan committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a5caae9 View commit details
    Browse the repository at this point in the history

  2. Fix FileLock tests

    @JacobCallahan
    JacobCallahan committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    261b646 View commit details
    Browse the repository at this point in the history

  3. Lock dynaconf version below 3.2.1 

    3.2.1 introduced a issue that will be resolved in 3.2.2
    @JacobCallahan
    JacobCallahan committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    0a9f54f View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge branch '0.4.0' into 0.4.0-merging

    @Griffin-Sullivan
    Griffin-Sullivan committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    c7aed5e View commit details
    Browse the repository at this point in the history