Bump version and test OCaml 4.02.1 as well

mirage · Jan 29, 2015 · d30e370 · d30e370
1 parent 2f5927a
commit d30e370
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.travis-ci.sh b/.travis-ci.sh
@@ -5,6 +5,7 @@ case "$OCAML_VERSION,$OPAM_VERSION" in
 3.12.1,1.2.0) ppa=avsm/ocaml312+opam12 ;;
 4.00.1,1.2.0) ppa=avsm/ocaml40+opam12 ;;
 4.01.0,1.2.0) ppa=avsm/ocaml41+opam12 ;;
+4.02.0,1.2.0) ppa=avsm/ocaml42+opam12 ;;
 *) echo Unknown $OCAML_VERSION,$OPAM_VERSION; exit 1 ;;
 esac
 

diff --git a/.travis.yml b/.travis.yml
@@ -2,3 +2,4 @@ language: c
 script: bash -ex .travis-ci.sh
 env:
   - OCAML_VERSION=4.01.0 OPAM_VERSION=1.2.0
+  - OCAML_VERSION=4.02.0 OPAM_VERSION=1.2.0
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
-2.2.1 (trunk):
+2.2.1 (2015-01-29):
+* Fix logging errors when `mirage` output is not redirected. (#355)
 * Do not reverse the order of C libraries when linking.  This fixes Zarith
   linking in Xen mode. (#341).
+* Fix typos in command line help. (#352).
 
 2.2.0 (2014-12-18):
 * Add IPv6 support. This alters some of the interfaces that were previously

diff --git a/_oasis b/_oasis
@@ -1,10 +1,10 @@
-OASISFormat: 0.3
+OASISFormat: 0.4
 Name:        mirage
 Version:     2.2.1
 Synopsis:    Mirage configuration tool
 Authors:     Thomas Gazagnaire, Anil Madhavapeddy
 License:     ISC
-Plugins:     META (0.3)
+Plugins:     META (0.4)
 BuildTools:  ocamlbuild
 
 Library mirage

diff --git a/setup.ml b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.5 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 205136e6dac5d7b315b4fc46630f5d2c) *)
+(* DO NOT EDIT (digest: 5ae6cde84311d90d2e9763415898eb29) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6667,7 +6667,7 @@ let setup_t =
      distclean_doc = [];
      package =
        {
-          oasis_version = "0.3";
+          oasis_version = "0.4";
           ocaml_version = None;
           findlib_version = None;
           alpha_features = [];
@@ -6822,14 +6822,14 @@ let setup_t =
                    },
                    {exec_custom = false; exec_main_is = "main.ml"})
             ];
-          plugins = [(`Extra, "META", Some "0.3")];
+          plugins = [(`Extra, "META", Some "0.4")];
           disable_oasis_section = [];
           schema_data = PropList.Data.create ();
           plugin_data = []
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "5(\020(ÂEÄ2\017¨&-`K[¼";
+     oasis_digest = Some ">^\024cÿ.~«§\143G½kf\"\020";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false