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: NixOS/infra
base: 9c14c71014cc
Choose a base ref
...
head repository: NixOS/infra
compare: 606e4ea8128b
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 3, 2020

  1. Serve grafana and prometheus under monitoring.nixos.org 

    From now we should serve them at the same time, but we will remove this
in the next steps. For more please refer to #137
    @garbas
    garbas committed Dec 3, 2020
    Copy the full SHA
    bd43f81 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2020

  1. delft/flake.lock: Update 

    Flake input changes:

* Updated 'nixpkgs': 'github:NixOS/nixpkgs/80666202999a39585bd73adb2286c134d07499f1' -> 'github:NixOS/nixpkgs/647cc06986c1ae4a2bb05298e0cf598723e42970'
    @edolstra
    edolstra committed Dec 18, 2020
    Copy the full SHA
    b542958 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/serve-status-under-monitoring' i… 

    …nto master
    @edolstra
    edolstra committed Dec 18, 2020
    Copy the full SHA
    92b9adc View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into remove-status-nixos… 

    …-org
    @garbas
    garbas committed Dec 18, 2020
    Copy the full SHA
    606e4ea View commit details
    Browse the repository at this point in the history