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: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0332db0a2c67
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba1e6e8ba19c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2018

  1. Copy the full SHA
    88cdb71 View commit details

Commits on Nov 8, 2018

  1. Merge pull request #941 from hannesm/no-conflict

    remove conflicts from opam - mirage generates code with such lower bounds
    hannesm authored Nov 8, 2018
    Copy the full SHA
    ba1e6e8 View commit details
Showing with 0 additions and 8 deletions.
  1. +0 −8 mirage.opam
8 changes: 0 additions & 8 deletions mirage.opam
Original file line number Diff line number Diff line change
@@ -25,14 +25,6 @@ depends: [
"logs"
"mirage-runtime" {>= "3.2.0"}
]
conflicts: [
"nocrypto" {< "0.4.0"}
"cstruct" {< "1.0.1"}
"io-page" {< "1.4.0"}
"crunch" {< "1.2.2"}
"mirage-solo5" {< "0.4.0"}
"tcpip" {< "3.5.0"}
]
synopsis: "The MirageOS library operating system"
description: """
MirageOS is a library operating system that constructs unikernels for