Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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: NixOS/nixpkgs-channels
base: 015541ea6a35
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 035269437312
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 13, 2019

  1. Allow the definition of extra options on commandline

    I stumbled upon an issue with the Alertmanager that required
    an additional comand line option. See https://groups.google.com/forum/#!msg/prometheus-users/-5wd-P13xCI/lGLBHHgnBgAJ
    
    (cherry picked from commit 69e4e49)
    
    Without this, Nixos machines on 18.09 that have no private IP addresses cannot start Alertmanager.
    NixOS/nixpkgs#46068
    NixOS/nixpkgs#45302
    azazel75 authored and tomfitzhenry committed Jan 13, 2019
    Copy the full SHA
    ef7c9c4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #53877 from tomfitzhenry/cherry-pick-alertmanager-…

    …extra-flags
    
    Alertmanager: Allow the definition of extra options on commandline
    samueldr committed Jan 13, 2019
    Copy the full SHA
    0352694 View commit details
    Browse the repository at this point in the history