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/nixpkgs
base: cd52a3d53cd9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 12d6fed2ba3d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 16, 2017

  1. nixos/tests: unbreak prometheus test 

    Commit 271d3f7 ("prometheus service: globalConfig.labels is obsolete")
removed globalConfig.labels. Update the test config accordingly.
    @bjornfor
    bjornfor committed Oct 16, 2017
    Copy the full SHA
    774d058 View commit details
    Browse the repository at this point in the history

  2. nixos/tests: enable prometheus test 

    As far as I can tell, we've had this test since 2015, but it was never
enabled.
    @bjornfor
    bjornfor committed Oct 16, 2017
    Copy the full SHA
    12d6fed View commit details
    Browse the repository at this point in the history