diff --git a/CHANGES.md b/CHANGES.md index df9077a9f8..940b19e193 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +### 0.11.1 (2016-06-14) + +* Fix compilation of examples (#359, @samoht) + ### 0.11.0 (2016-05-04) * Use Logs (#342, @talex5) diff --git a/_oasis b/_oasis index 2fd4e72155..a89faba900 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: irmin -Version: 0.11.0 +Version: 0.11.1 Synopsis: A Distributed Version Control Database Authors: Thomas Gazagnaire, Thomas Leonard License: ISC diff --git a/examples/config.ml b/examples/config.ml index 30c218bc2b..1b5a8942c2 100644 --- a/examples/config.ml +++ b/examples/config.ml @@ -5,15 +5,6 @@ let init () = let _ = Sys.command (Printf.sprintf "mkdir -p %s" root) in () -(* Enable debug outputs if DEBUG is set *) -let () = - try match Sys.getenv "DEBUG" with - | "" -> () - | _ -> - Log.color_on (); - Log.set_log_level Log.DEBUG - with Not_found -> () - (* Install the FS listener. *) let () = Irmin_unix.install_dir_polling_listener 0.5 diff --git a/examples/views.ml b/examples/views.ml index b3d6ac28d6..4ddacb3c51 100644 --- a/examples/views.ml +++ b/examples/views.ml @@ -16,7 +16,6 @@ type t2 = { type t = t2 list let view_of_t t = - Log.debug "view_of_t"; View.empty () >>= fun v -> Lwt_list.iteri_s (fun i t2 -> let i = string_of_int i in @@ -26,7 +25,6 @@ let view_of_t t = return v let t_of_view v = - Log.debug "t_of_view"; let aux acc i = let i = string_of_int i in View.read_exn v [i;"x"] >>= fun x -> diff --git a/lib/META b/lib/META index d6701bcd55..41d33726ba 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 4089f03f9b1e1ac3263239fc168dc205) -version = "0.11.0" +# DO NOT EDIT (digest: d34a0409c682d27bb7046835c393c53a) +version = "0.11.1" description = "A Distributed Version Control Database" requires = "ezjsonm ocamlgraph lwt logs cstruct tc mstruct uri stringext hex" archive(byte) = "irmin.cma" @@ -9,7 +9,7 @@ archive(native) = "irmin.cmxa" archive(native, plugin) = "irmin.cmxs" exists_if = "irmin.cma" package "unix" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin irmin.mem irmin.git irmin.fs irmin.http git.unix cohttp.lwt" @@ -21,7 +21,7 @@ package "unix" ( ) package "mirage" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin irmin.mem irmin.git irmin.fs irmin.http cohttp.lwt git.mirage" @@ -33,7 +33,7 @@ package "mirage" ( ) package "mem" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin" archive(byte) = "irmin-mem.cma" @@ -44,7 +44,7 @@ package "mem" ( ) package "http" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin cohttp.lwt-core ezjsonm.lwt re re.pcre re.perl" archive(byte) = "irmin-http.cma" @@ -55,7 +55,7 @@ package "http" ( ) package "git" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin git" archive(byte) = "irmin-git.cma" @@ -66,7 +66,7 @@ package "git" ( ) package "fs" ( - version = "0.11.0" + version = "0.11.1" description = "A Distributed Version Control Database" requires = "irmin" archive(byte) = "irmin-fs.cma" diff --git a/setup.ml b/setup.ml index 18eac4c8c3..35c68691ed 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.2 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 31b3c4b86f83682262cec94a98a0b87d) *) +(* DO NOT EDIT (digest: 1c631941ef28f5c2a3671be1c2a239aa) *) (* Regenerated by OASIS v0.4.6 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6884,7 +6884,7 @@ let setup_t = alpha_features = []; beta_features = []; name = "irmin"; - version = "0.11.0"; + version = "0.11.1"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7710,7 +7710,8 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.6"; - oasis_digest = Some "×\003a}\002O|°a6'fNtÙ°"; + oasis_digest = + Some "\018n\023\145\169\003\205\166[\209\245k\135\214\n\157"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7718,6 +7719,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7722 "setup.ml" +# 7723 "setup.ml" (* OASIS_STOP *) let () = setup ();;