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: 050cac5f4764
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f441498c611
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Sep 8, 2015

  1. Prepare to release 2.6.1 

    Signed-off-by: David Scott <dave.scott@citrix.com>
    David Scott committed Sep 8, 2015
    Copy the full SHA
    23c7b02 View commit details

  2. Regenerate OASIS 

    Signed-off-by: David Scott <dave.scott@citrix.com>
    David Scott committed Sep 8, 2015
    Copy the full SHA
    3959d26 View commit details

Commits on Sep 9, 2015

  1. Merge pull request #444 from djs55/release.2.6.1 

    Prepare to release 2.6.1
    @djs55
    djs55 committed Sep 9, 2015
    Copy the full SHA
    8f44149 View commit details
Showing with 11 additions and 8 deletions.
  1. +2 −0 CHANGES.md
  2. +1 −1 _oasis
  3. +3 −3 lib/META
  4. +5 −4 setup.ml
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
### 2.6.1 (2015-09-08)

* Xen: improve the .xl file generation. We now have
- `name.xl`: this has sensible defaults for everything including the
network bridges and should "just work" if used on the build box
2 changes: 1 addition & 1 deletion _oasis
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: mirage
Version: 2.6.0
Version: 2.6.1
Synopsis: Mirage configuration tool
Authors: Thomas Gazagnaire, Anil Madhavapeddy, Dave Scott, Thomas Leonard
License: ISC
6 changes: 3 additions & 3 deletions lib/META
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 7a2d8b17478934bc9f293016a7b64c3f)
version = "2.6.0"
# DO NOT EDIT (digest: b6274596ee1a156bcbd890ac65d913a0)
version = "2.6.1"
description = "Mirage configuration tool"
requires = "ipaddr unix dynlink lwt mirage-types mirage-types.lwt"
archive(byte) = "mirage.cma"
@@ -9,7 +9,7 @@ archive(native) = "mirage.cmxa"
archive(native, plugin) = "mirage.cmxs"
exists_if = "mirage.cma"
package "runtime" (
version = "2.6.0"
version = "2.6.1"
description = "Mirage configuration tool"
archive(byte) = "mirage-runtime.cma"
archive(byte, plugin) = "mirage-runtime.cma"
9 changes: 5 additions & 4 deletions setup.ml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 355566f3f058d394bd1d7d7788903bf1) *)
(* DO NOT EDIT (digest: 45cea6766cc1d6d5925abff97a8a3612) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6683,7 +6683,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "mirage";
version = "2.6.0";
version = "2.6.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6873,14 +6873,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "ã-\b\138¡h\003À\027ìxòX4%n";
oasis_digest =
Some "\000h\164\005\209\017\175\170\248|\173\205\n\231\249r";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 6885 "setup.ml"
# 6886 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;