Merge pull request #1852 from shadowdragon89/releng_20210428_152741

Update version for 2.5.0-rc2 release.

Author: shadowdragon89

WORKSPACE

@@ -15,8 +15,8 @@ workspace(name = "tf_serving")
 load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "68437339e0d5854d28157ba77a4ae30954f35d08899675e3bb6da9824fbb904a",
-    git_commit = "0d1805aede03d25aa9d49adcef6903535fa5ad14",
+    sha256 = "f6bdf5898df6e54508a93e6f5c4adb37523d03d9c9337d6c387c635bab241530",
+    git_commit = "e0b8bbee7a66d5afa8b309a06fbfb61b4169266f",
 )
 
 # 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-rc1",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.0-rc2",  # 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-rc1",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.5.0-rc2",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )

tensorflow_serving/model_servers/version.h

@@ -27,7 +27,7 @@ limitations under the License.
 #define TF_MODELSERVER_PATCH_VERSION 0
 // TF_MODELSERVER_VERSION_SUFFIX is non-empty for pre-releases
 // (e.g. "-alpha", "-alpha.1", "-beta", "-rc", "-rc.1")
-#define TF_MODELSERVER_VERSION_SUFFIX "-rc1"
+#define TF_MODELSERVER_VERSION_SUFFIX "-rc2"
 
 #ifndef TF_MODELSERVER_VERSION_NO_META
 // TF_MODELSERVER_BUILD_TAG can be set to be nightly for nightly builds

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-rc1'
+_VERSION = '2.5.0-rc2'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=2.5.0-rc1,<3'
+_TF_VERSION = '>=2.5.0-rc2,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'