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-2.0
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 48 files changed
  • 4 contributors

Commits on Dec 24, 2019

  1. Change import for release-v2 branch to v2

    Antoine Pelisse committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    af6d4c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #138 from apelisse/release/v2-1.17 

    Change import for release-v2 branch to v2
    @k8s-ci-robot
    k8s-ci-robot authored Dec 24, 2019
    Configuration menu
    Copy the full SHA
    1779409 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. Fix useless error message 'invalid atom'

    jennybuckley authored and Kevin Wiesmüller committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    fc972c0 View commit details
    Browse the repository at this point in the history

  2. Add test for null/{} behavior of deduced types

    jennybuckley authored and Kevin Wiesmüller committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    2e2bf97 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #144 from kwiesmueller/backport-fix-ugly 

    Back-port Fix from Jenny for ugly errors to 2.0
    @k8s-ci-robot
    k8s-ci-robot authored Jan 10, 2020
    Configuration menu
    Copy the full SHA
    05fad52 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2020

  1. merge: Apply returns nil object if unchanged 

    We need to know when the apply operation isn't changing the object, so
that we can update the timestamp of the operation. The simplest way to
do so it to return nil.
    @apelisse
    Antoine Pelisse authored and apelisse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    e7214fc View commit details
    Browse the repository at this point in the history

  2. fieldpath.ManagedFields: Add Equals method

    @apelisse
    Antoine Pelisse authored and apelisse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    c4f7e54 View commit details
    Browse the repository at this point in the history

  3. ManagedFields: Implement Copy method

    @apelisse
    Antoine Pelisse authored and apelisse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    1cd02c3 View commit details
    Browse the repository at this point in the history

  4. make schema.Equals pointer receivers for Map and Schema 

    This fixes data races caused by copied mutexes

change schema types to pointers

Revert "change schema types to pointers"

This reverts commit 92e30db.

change equals methods to pointer receivers
    @apelisse
    Kevin Wiesmüller authored and apelisse committed Mar 16, 2020
    Configuration menu
    Copy the full SHA
    65095a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2020

  1. Merge pull request #159 from apelisse/nil-on-noop-apply 

    Nil on noop apply
    @k8s-ci-robot
    k8s-ci-robot authored Mar 17, 2020
    Configuration menu
    Copy the full SHA
    f4bee7d View commit details
    Browse the repository at this point in the history
Loading