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: 604b0f34c96e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b5f4f228d666
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 25, 2018

  1. nixos/rspamd: Allow worker type to be proxy again 

    When reworking the rspamd workers I disallowed `proxy` as a type and
instead used `rspamd_proxy` which is the correct name for that worker
type. That change breaks peoples existing config and so I have made this
commit which allows `proxy` as a worker type again but makes it behave
as `rspamd_proxy` and prints a warning if you use it.
    @griff
    griff committed Nov 25, 2018
    Copy the full SHA
    0d753af View commit details
    Browse the repository at this point in the history

  2. Merge pull request #51012 from griff/rspamd-proxy-type 

    nixos/rspamd: Allow worker type to be proxy again
    @infinisil
    infinisil committed Nov 25, 2018
    Copy the full SHA
    b5f4f22 View commit details
    Browse the repository at this point in the history