xapi-project / xen-api / 13758209973

78%

master: 80%

push

github

Merge master to feature branch (#6348)

Conflict solved:
```
$ git diff
diff --cc ocaml/idl/schematest.ml
index b534f108a,255e094e1..000000000
--- a/ocaml/idl/schematest.ml
+++ b/ocaml/idl/schematest.ml
@@@ -3,7 -3,7 +3,11 @@@ let hash x = Digest.string x |> Digest.
  (* BEWARE: if this changes, check that schema has been bumped accordingly in
     ocaml/idl/datamodel_common.ml, usually schema_minor_vsn *)

++<<<<<<< HEAD
 +let last_known_schema_hash = "34390a071f5df0fac8dcf9423a9111ae"
++=======
+ let last_known_schema_hash = "ad67a64cd47cdea32085518c1fb38d27"
++>>>>>>> master
```

Commit b6ced4474 is new for updating
last_known_schema_hash and datamodel lifecycle

1 of 1 new or added line in 1 file covered. (100.0%)

3354 of 4315 relevant lines covered (77.73%)

0.78 hits per line