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: containers/conmon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.2.0
Choose a base ref
...
head repository: containers/conmon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.2.1
Choose a head ref
  • 16 commits
  • 9 files changed
  • 4 contributors

Commits on Jan 12, 2026

  1. Release v2.2.0

    Update VERSION to 2.2.0 and rpm/conmon.spec version.
    
    Signed-off-by: Jindrich Novy <[email protected]>
    jnovy committed Jan 12, 2026
    1 Configuration menu
    Copy the full SHA
    27ef050 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2026

  1. tests: Ensure necessary dependencies are available

    While most of the runtime dependencies of the test harness were being
    checked, `socat(1)` had been overlooked. Incorporate a dependency check
    into the `run-tests` script for it so that the tests don't just
    mysteriously fail without first indicating that `socat` is required (in
    the same way as is done with `runc(8)` and others)
    
    Signed-off-by: Scott S. McCoy <[email protected]>
    ssmccoy committed Jan 17, 2026
    Configuration menu
    Copy the full SHA
    de539b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2026

  1. Merge pull request #627 from ssmccoy/ssmccoy/socat-dependency-check

    tests: Ensure necessary dependencies are available
    jnovy authored Jan 19, 2026
    1 Configuration menu
    Copy the full SHA
    6de0768 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2026

  1. Fix k8s-file log format for terminating F-sequence

    The k8s-file format requires the space separator between tag and content
    to be present even when content is empty. The terminating F-sequence
    generated for partial log lines was missing this mandatory space,
    causing podman logs to fail with "is not a valid container log line".
    
    Changed terminating F-sequence from "F\n" to "F \n" and updated byte
    counts accordingly. Fixed test assertions to validate the correct format.
    
    Fixes containers/podman#28014
    
    Signed-off-by: Jindrich Novy <[email protected]>
    jnovy committed Feb 3, 2026
    Configuration menu
    Copy the full SHA
    93d4e63 View commit details
    Browse the repository at this point in the history
  2. Skip test if RUNTIME_BINARY is not runc

    Also rename the test to reflect the fact that it uses runc
    
    Signed-off-by: Ricardo Branco <[email protected]>
    ricardobranco777 committed Feb 3, 2026
    Configuration menu
    Copy the full SHA
    3bb1a4e View commit details
    Browse the repository at this point in the history
  3. Merge pull request #628 from ricardobranco777/crun

    Skip test if RUNTIME_BINARY is not runc
    jnovy authored Feb 3, 2026
    1 Configuration menu
    Copy the full SHA
    79c334c View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2026

  1. Merge pull request #629 from jnovy/ffix

    Fix k8s-file log format for terminating F-sequence
    jnovy authored Feb 4, 2026
    1 Configuration menu
    Copy the full SHA
    67718f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2026

  1. Revert PR #629

    This reverts commit 67718f2.
    
    Breaks CRI-O and Kubernetes CI. See PR #629 discussion.
    jnovy committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    894e164 View commit details
    Browse the repository at this point in the history
  2. Revert PR #592

    This reverts commit e25af44.
    
    Breaks CRI-O and Kubernetes CI. See PR #629 discussion.
    jnovy committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    8563b0a View commit details
    Browse the repository at this point in the history
  3. Fix test for reverted F-sequence behavior

    After reverting PR #592 and #629, remove assertion expecting terminating
    F-sequence that is no longer generated.
    jnovy committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    5863a7f View commit details
    Browse the repository at this point in the history
  4. Add CRI-O critest

    Signed-off-by: Ayato Tokubi <[email protected]>
    bitoku committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    f8cc9d6 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #630 from jnovy/fsequence_revert

    Revert F-sequence behavior
    jnovy authored Feb 10, 2026
    2 Configuration menu
    Copy the full SHA
    1a598b9 View commit details
    Browse the repository at this point in the history
  6. Fix EAGAIN busy-loop in drain_stdio()

    Return false on EAGAIN to stop draining instead of looping.
    
    Fixes #632
    
    Signed-off-by: Jindrich Novy <[email protected]>
    jnovy committed Feb 10, 2026
    Configuration menu
    Copy the full SHA
    2cf4dcd View commit details
    Browse the repository at this point in the history
  7. Merge pull request #633 from jnovy/cpu_load

    Fix EAGAIN busy-loop in drain_stdio()
    jnovy authored Feb 10, 2026
    1 Configuration menu
    Copy the full SHA
    139a2c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2026

  1. Merge pull request #631 from bitoku/critest

    Add CRI-O critest
    jnovy authored Feb 11, 2026
    1 Configuration menu
    Copy the full SHA
    c4599eb View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2026

  1. Release v2.2.1

    Update VERSION to 2.2.1 and rpm/conmon.spec version.
    
    Signed-off-by: Jindrich Novy <[email protected]>
    jnovy committed Feb 12, 2026
    Configuration menu
    Copy the full SHA
    c8cc2c4 View commit details
    Browse the repository at this point in the history
Loading