Merge branch 'master' into braids

Raku · Feb 18, 2017 · f414161 · f414161
2 parents d77f4fc + d731403
commit f414161
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2017.01
+2017.02
diff --git a/t/serialization/02-types.t b/t/serialization/02-types.t
@@ -416,7 +416,8 @@ sub add_to_sc($sc, $idx, $obj) {
 
     ok(nqp::eqaddr(nqp::typeparameterat($new_with_foo, 0), Foo), "We can parameterize with a type object using a deserialized parameterizer ");
 
-    ok(nqp::eqaddr($new_with_foo, $dsc_with_foo), "We get stuff from the type cache");
+    skip('Fails on JVM', 1);
+    #ok(nqp::eqaddr($new_with_foo, $dsc_with_foo), "We get stuff from the type cache");
     ok(!nqp::eqaddr($new_with_bar, $dsc_with_foo), "Parameterizing with a type object that's not in cache");
 
 }

diff --git a/tools/build/MOAR_REVISION b/tools/build/MOAR_REVISION
@@ -1 +1 @@
-2017.01-72-g542baec
+2017.02