Merge pull request #1771 from shadowdragon89/releng_20201119_143440

Update version for 2.4.0-rc2 release.

Author: shadowdragon89

WORKSPACE

@@ -11,8 +11,8 @@ load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "2e216e1906712fb43738d55388cdcd710e9325dc8df4e703df6d40b358608518",
-    git_commit = "856698be1fe9c624310fbcc131c002b15b3d0b12",
+    sha256 = "098733e15e227a6a55997295ca761a9a8e7169b64104ea86feb952e4e2ea0bc9",
+    git_commit = "0b06f2927be226ffe44f47bfa9e03e4ea649d7f3",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

tensorflow_serving/model_servers/BUILD

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

tensorflow_serving/model_servers/version.h

@@ -22,12 +22,12 @@ limitations under the License.
 #define TF_MODELSERVER_STR_HELPER(x) #x
 #define TF_MODELSERVER_STR(x) TF_MODELSERVER_STR_HELPER(x)
 
-#define TF_MODELSERVER_MAJOR_VERSION 0
-#define TF_MODELSERVER_MINOR_VERSION 0
+#define TF_MODELSERVER_MAJOR_VERSION 2
+#define TF_MODELSERVER_MINOR_VERSION 4
 #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 ""
+#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 = '0.0.0'
+_VERSION = '2.4.0-rc2'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=1.2.0,<3'
+_TF_VERSION = '>=2.4,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'