Merge pull request #1861 from netfs/releng_20210513_124441

Update version for 2.5.1 release.

Author: netfs

WORKSPACE

@@ -15,8 +15,8 @@ workspace(name = "tf_serving")
 load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "2bd08db59a42ffa9fec6921d8dcfdcc98de4c7ae71c55febc37ba79021f2204b",
-    git_commit = "fcdf659347024dc5a3130e866ba3dde10bac72b0",
+    sha256 = "cb99f136dc5c89143669888a44bfdd134c086e1e2d9e36278c1eb0f03fe62d76",
+    git_commit = "a4dfb8d1a71385bd6d122e4f27f86dcebb96712d",
 )
 
 # Import all of TensorFlow Serving's external dependencies.

tensorflow_serving/model_servers/BUILD

@@ -490,7 +490,7 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server",
-    version = "2.5.0-rc3",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.1",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
 
 # Build with '-c opt'
@@ -501,5 +501,5 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server-universal",
-    version = "2.5.0-rc3",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.1",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )

tensorflow_serving/model_servers/version.h

@@ -24,7 +24,7 @@ limitations under the License.
 
 #define TF_MODELSERVER_MAJOR_VERSION 2
 #define TF_MODELSERVER_MINOR_VERSION 5
-#define TF_MODELSERVER_PATCH_VERSION 0
+#define TF_MODELSERVER_PATCH_VERSION 1
 // TF_MODELSERVER_VERSION_SUFFIX is non-empty for pre-releases
 // (e.g. "-alpha", "-alpha.1", "-beta", "-rc", "-rc.1")
 #define TF_MODELSERVER_VERSION_SUFFIX "-rc3"

tensorflow_serving/tools/pip_package/setup.py

@@ -31,9 +31,9 @@
 DOCLINES = __doc__.split('\n')
 
 # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
-_VERSION = '2.5.0-rc3'
+_VERSION = '2.5.1'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=2.5.0-rc3,<3'
+_TF_VERSION = '>=2.5.0,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'