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

Commits on Mar 14, 2016

  1. re-run oasis to get correct version number (2.7.0)

    Signed-off-by: Mindy Preston <mindy.preston@docker.com>
    yomimono committed Mar 14, 2016
    Copy the full SHA
    c1520cb View commit details
  2. Merge pull request #513 from yomimono/fix_version

    re-run oasis to get correct version number (2.7.0)
    samoht committed Mar 14, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    7779a7b View commit details
Showing with 8 additions and 7 deletions.
  1. +3 −3 lib/META
  2. +5 −4 setup.ml
6 changes: 3 additions & 3 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 34328920c8396464d8e1495aaeddf904)
version = "2.6.1"
# DO NOT EDIT (digest: 5e8298e9163c1abb10551d46f791dbf5)
version = "2.7.0"
description = "Mirage configuration tool"
requires = "ipaddr functoria mirage.runtime functoria.app"
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.1"
version = "2.7.0"
description = "Mirage configuration tool"
requires = "functoria.runtime ipaddr"
archive(byte) = "mirage-runtime.cma"
9 changes: 5 additions & 4 deletions setup.ml
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: c716228fe68998b75512569ad94e1ece) *)
(* DO NOT EDIT (digest: 20781bca1b4b6d8e01aaa8937f923a37) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6695,7 +6695,7 @@ let setup_t =
alpha_features = ["ocamlbuild_more_args"];
beta_features = [];
name = "mirage";
version = "2.6.1";
version = "2.7.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -6887,14 +6887,15 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "®Ý~\150}\005\141ATÙ\134xC¯\144ð";
oasis_digest =
Some "\240\2068J\207\233\144b\179\182\203\197\145D\137\003";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
};;

let setup () = BaseSetup.setup setup_t;;

# 6899 "setup.ml"
# 6900 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;