From 06d9307ae237bcf9d01d6b4ad230cdb10c47d098 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 3 Apr 2015 17:53:49 -0400
Subject: - changelog + docstring for pullreq github:164

---
 lib/sqlalchemy/orm/query.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/sqlalchemy/orm/query.py')

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 61cf3933f..d02c071db 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2860,6 +2860,13 @@ class Query(object):
             The expression evaluator currently doesn't account for differing
             string collations between the database and Python.
 
+        :param update_args: Optional dictionary, if present will be passed
+         to the underlying :func:`.update` construct as the ``**kw`` for
+         the object.  May be used to pass dialect-specific arguments such
+         as ``mysql_limit``.
+
+         .. versionadded:: 1.0.0
+
         :return: the count of rows matched as returned by the database's
          "row count" feature.
 
-- 
cgit v1.2.1