Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes-sigs/structured-merge-diff
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: kubernetes-sigs/structured-merge-diff
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release-3.0
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 11 files changed
  • 4 contributors

Commits on Nov 24, 2020

  1. Fix incorrect godoc on GetFrom 

    Signed-off-by: Chris Tarazi <[email protected]>
    @christarazi @ialidzhikov
    christarazi authored and ialidzhikov committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    5f59a77 View commit details
    Browse the repository at this point in the history

  2. Fix panic on pointer to embedded struct 

    This commit converts an embedded struct into its original type if it is
a pointer.

Fixes:
#172

Signed-off-by: Chris Tarazi <[email protected]>
    @christarazi @ialidzhikov
    christarazi authored and ialidzhikov committed Nov 24, 2020
    Configuration menu
    Copy the full SHA
    005e28f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #180 from ialidzhikov/fix/panic-on-embedded-struct 

    Cherry pick of #173: Fix panic on pointer to embedded struct
    @k8s-ci-robot
    k8s-ci-robot authored Nov 24, 2020
    Configuration menu
    Copy the full SHA
    f5fd4ea View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. Remove fields when unset from applied configuration if there are no o… 

    …ther owners
    @jpbetz @apelisse
    jpbetz authored and apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    c7239f7 View commit details
    Browse the repository at this point in the history

  2. Add field unsetting tests

    @jpbetz @apelisse
    jpbetz authored and apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    173a95e View commit details
    Browse the repository at this point in the history

  3. Apply suggestion 

    Co-authored-by: Antoine Pelisse <[email protected]>
    @jpbetz @apelisse
    jpbetz and apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    e96f1eb View commit details
    Browse the repository at this point in the history

  4. Change merge rules so that updaters to share ownership with appliers

    @jpbetz @apelisse
    jpbetz authored and apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    95a763d View commit details
    Browse the repository at this point in the history

  5. Add and fix tests to match improved update merging

    @jpbetz @apelisse
    jpbetz authored and apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    660a7a3 View commit details
    Browse the repository at this point in the history

  6. Add missing TypedValue.Schema function

    @apelisse
    apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    8035048 View commit details
    Browse the repository at this point in the history

  7. Create NestedSet to populate set branches along with the leaves

    @apelisse
    apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    35bfbd9 View commit details
    Browse the repository at this point in the history

  8. Use NestedSet to also remove structs owned by no-one

    @apelisse
    apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    6611ec9 View commit details
    Browse the repository at this point in the history

  9. Fix tests broken by new mechanism

    @apelisse
    apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    928ab00 View commit details
    Browse the repository at this point in the history

  10. Show how null is inserted when struct is removed

    @apelisse
    apelisse committed Mar 25, 2021
    Configuration menu
    Copy the full SHA
    65b8000 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2021

  1. Merge pull request #190 from apelisse/cherry-pick-166-184 

    Cherry pick 166 184
    @k8s-ci-robot
    k8s-ci-robot authored Mar 29, 2021
    Configuration menu
    Copy the full SHA
    7cc0d63 View commit details
    Browse the repository at this point in the history
Loading