Skip to content

Commit

Permalink
Merge pull request #42 from avsm/master
Browse files Browse the repository at this point in the history
release 1.3.1
  • Loading branch information
djs55 committed Mar 7, 2015
2 parents 943c121 + ae28dd3 commit a64d152
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 18 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ language: c
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.2.0
- OCAML_VERSION=4.00.1 OPAM_VERSION=1.2.0
- OCAML_VERSION=latest OPAM_VERSION=1.2.0
- OCAML_VERSION=4.01 OPAM_VERSION=1.2.0
- OCAML_VERSION=4.00 OPAM_VERSION=1.2.0
3 changes: 3 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.3.1 (07-Mar-2015)
* Add an explicit `connect` to the interface signature (#35)

1.3.0 (29-Jan-2015)
* Update to `io-page.1.4.0` interface.
* Add an `opam` 1.2 file for more convenient development.
Expand Down
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: mirage-block-xen
Version: 1.3.0
Version: 1.3.1
Synopsis: Xen block frontend and backend driver implementation
Authors: Jonathan Ludlam, Anil Madhavapeddy, David Scott
License: ISC
Expand Down
8 changes: 4 additions & 4 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 46114d54a10176c0176c5adcaf31ad1a)
version = "1.3.0"
# DO NOT EDIT (digest: ae6c113c90bee98799d7155a2f5fe5c5)
version = "1.3.1"
description = "Xen block frontend and backend driver implementation"
requires = "cstruct cstruct.syntax"
archive(byte) = "mirage_block_xen.cma"
Expand All @@ -9,7 +9,7 @@ archive(native) = "mirage_block_xen.cmxa"
archive(native, plugin) = "mirage_block_xen.cmxs"
exists_if = "mirage_block_xen.cma"
package "front" (
version = "1.3.0"
version = "1.3.1"
description = "Xen block frontend and backend driver implementation"
requires =
"lwt lwt.syntax cstruct cstruct.syntax mirage-types io-page shared-memory-ring shared-memory-ring.lwt mirage-block-xen xen-evtchn xen-gnt mirage-xen"
Expand All @@ -21,7 +21,7 @@ package "front" (
)

package "back" (
version = "1.3.0"
version = "1.3.1"
description = "Xen block frontend and backend driver implementation"
requires =
"lwt lwt.syntax cstruct cstruct.syntax io-page shared-memory-ring shared-memory-ring.lwt mirage-block-xen xen-evtchn xen-gnt xenstore"
Expand Down
16 changes: 8 additions & 8 deletions opam
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
opam-version: "1"
maintainer: "[email protected]"

opam-version: "1.2"
maintainer: "[email protected]"
homepage: "https://github.com/mirage/mirage-block-xen"
dev-repo: "https://github.com/mirage/mirage-block-xen.git"
bug-reports: "https://github.com/mirage/mirage-block-xen/issues"
tags: [
"org:mirage"
"org:xapi-project"
]
build: [
[make]
[make "install" "BINDIR=%{bin}%"]
]
remove: [[make "uninstall" "BINDIR=%{bin}%"]]
build: [ [make] ]
install: [ [make "install" "BINDIR=%{bin}%"] ]
remove: [ [make "uninstall" "BINDIR=%{bin}%"] ]
depends: [
"ocamlfind"
"cmdliner"
Expand Down
6 changes: 3 additions & 3 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.3.1 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 6cc96b3fcfa6b1b5927ea15d8225d619) *)
(* DO NOT EDIT (digest: 505d2a25e6f8e2f04e5316236899ea24) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6673,7 +6673,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "mirage-block-xen";
version = "1.3.0";
version = "1.3.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -6855,7 +6855,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "ÉG·ÆYDÍùÒx\024k{Ê¡¹";
oasis_digest = Some "\147èí0Grfh=\028cB%gè";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down

0 comments on commit a64d152

Please sign in to comment.