Merge pull request #306 from suomiy/fixes

Fixes
oVirt · Feb 20, 2019 · a9aad83 · a9aad83
2 parents 6088c86 + 747e047
commit a9aad83
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...java/org/ovirt/mobile/movirt/auth/properties/property/version/support/VersionSupport.java b/...java/org/ovirt/mobile/movirt/auth/properties/property/version/support/VersionSupport.java
@@ -16,9 +16,7 @@ public enum VersionSupport {
 
     FOLLOW_LINKS(new Version(4, 2, 0), Version.MAX_VALUE),
 
-    // NPE on the engine: affects hosts
-    // FIXME: change supportedUntil after this bug is resolved https://bugzilla.redhat.com/show_bug.cgi?id=1547050
-    FOLLOW_BUG(new Version(4, 2, 0), Version.MAX_VALUE);
+    FOLLOW_BUG(new Version(4, 2, 0), new Version(4, 2, 2));
 
     private Version supportedFrom;
     private Version supportedUntil;

diff --git a/moVirt/src/main/java/org/ovirt/mobile/movirt/rest/dto/common/Statistic.java b/moVirt/src/main/java/org/ovirt/mobile/movirt/rest/dto/common/Statistic.java
@@ -14,6 +14,7 @@ public static class Values {
         public List<Value> value;
     }
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Value {
         public String datum;
     }