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: aabda49455e3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 519fd37e1f51
Choose a head ref
  • 13 commits
  • 14 files changed
  • 6 contributors

Commits on Oct 3, 2017

  1. terraform: noop 0.10 plugins mechanism when unused 

    (cherry picked from commit 11753b3)
    @copumpkin @fpletz
    copumpkin authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    5c93b1b View commit details
    Browse the repository at this point in the history

  2. terraform: build all known 0.10 plugins in Hydra 

    (cherry picked from commit e8b8864)
    @copumpkin @fpletz
    copumpkin authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    33a6d82 View commit details
    Browse the repository at this point in the history

  3. terraform: add template plugin for 0.10 

    (cherry picked from commit bcbcbfc)
    @copumpkin @fpletz
    copumpkin authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    bf3d5b3 View commit details
    Browse the repository at this point in the history

  4. terraform: providers list (#28818) 

    * terraform: move plugin index

* terraform: introduce update script for plugins

* terraform: update provider list

(cherry picked from commit 101ccc0)
    @zimbatm @fpletz
    zimbatm authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    4339eb0 View commit details
    Browse the repository at this point in the history

  5. terraform: revamp the providers list (#29097) 

    This fixes the ./update-all script to actually fetch all the available
providers (thanks pagination). It was also improver to user a more
compact representation of the data.

(cherry picked from commit 9f2ff1d)
    @zimbatm @fpletz
    zimbatm authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    730bee8 View commit details
    Browse the repository at this point in the history

  6. glusterfs service: Don't make it a prerequisite of network-online.tar… 

    …get.

This introduces dependency cycles.

A network file system to be running is not required for a network
connection to be available.

19759cf#commitcomment-22044519
(cherry picked from commit 5e2815d)
    @nh2 @fpletz
    nh2 authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    605b40c View commit details
    Browse the repository at this point in the history

  7. glusterfs service: Add settings to disable rpcbind and the events dae… 

    …mon.

See also #22225 (review)

(cherry picked from commit bd54b72)
    @nh2 @fpletz
    nh2 authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    9f8f750 View commit details
    Browse the repository at this point in the history

  8. glusterfs service: Add killMode and stopKillTimeout options 

    (cherry picked from commit e233a51)
    @nh2 @fpletz
    nh2 authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    f1d1a0a View commit details
    Browse the repository at this point in the history

  9. glusterfs service: Ensure log directory exists for glustereventsd. 

    Prevents glustereventsd failing at startup in case it starts
before glusterd has started (whose `preStart` would also
create the needed directory).

(cherry picked from commit 08f7e45)
    @nh2 @fpletz
    nh2 authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    b7b08a5 View commit details
    Browse the repository at this point in the history

  10. glusterfs service: Change default killMode to "control-group". 

    This is a better default for NixOS because it ensures that config
changes happen fully when NixOS users expect it.

(cherry picked from commit 18eecae)
    @nh2 @fpletz
    nh2 authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    28db622 View commit details
    Browse the repository at this point in the history

  11. glusterfs service: fix issues with useRpcbind 

    (cherry picked from commit 2239dc6)
    @bachp @fpletz
    bachp authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    2b20f8c View commit details
    Browse the repository at this point in the history

  12. gns3: "Improve" the packaging 

    This is "a bit" hacky tho...
The improvement is that it now covers the stable as well as the preview
releases and doesn't require Python 3.4 anymore.

(cherry picked from commit 5257232)
    @primeos @fpletz
    primeos authored and fpletz committed Oct 3, 2017
    Copy the full SHA
    2b99882 View commit details
    Browse the repository at this point in the history

  13. termite: fix bad merge 

    42dcf91 and
4d4c325 were cherry-picked in the wrong
order and merged wrong. The wrapper is not necessary due to wrapGAppsHook.
    @fpletz
    fpletz committed Oct 3, 2017
    Copy the full SHA
    519fd37 View commit details
    Browse the repository at this point in the history