merge RELEASE_NOTES update to head

John Belmonte · John Belmonte · commit 06d016dbd51f · 2012-12-06T11:57:11.000-08:00
diff --git a/ndb/model.py b/ndb/model.py
@@ -1682,7 +1682,7 @@ class JsonProperty(BlobProperty):
 
   _json_type = None
 
-  @utils.positional(BlobProperty._positional)
+  @utils.positional(1 + BlobProperty._positional)
   def __init__(self, name=None, compressed=False, json_type=None, **kwds):
     super(JsonProperty, self).__init__(name=name, compressed=compressed, **kwds)
     self._json_type = json_type
diff --git a/ndb/model_test.py b/ndb/model_test.py
@@ -1236,7 +1236,7 @@ class MyModel(model.Model):
 
   def testJsonProperty(self):
     class MyModel(model.Model):
-      pkl = model.JsonProperty()
+      pkl = model.JsonProperty('pkl')
     sample = [1, 2, {'a': 'one', 'b': [1, 2]}, 'xyzzy', [1, 2, 3]]
     ent = MyModel(pkl=sample)
     ent.put()
