Merge pull request #1884 from nniuzft/releng_20210630_130712

Update version for 2.6.0-rc0 release.

Author: nniuzft

WORKSPACE

@@ -15,8 +15,8 @@ workspace(name = "tf_serving")
 load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "fd687f8e26833cb917ae0bd8e434c9bd30c92042361c8ae69679983d3c66a440",
-    git_commit = "15198b1818bd2bf1b5b55bf5b02bf42398d222fc",
+    sha256 = "4caf4141e1e84536ad099c74d92d96a0acc75747734bd4e44d70c775e6e387ad",
+    git_commit = "a5317d67e6ce6e93de18011bfdcdd4ff7aa894cf",
 )
 
 # Import all of TensorFlow Serving's external dependencies.

tensorflow_serving/model_servers/BUILD

@@ -492,7 +492,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.6.0-rc0",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
 
 # Build with '-c opt'
@@ -503,5 +503,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.6.0-rc0",  # 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 6
 #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 "-rc0"
 
 #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.6.0-rc0'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=1.2.0,<3'
+_TF_VERSION = '>=2.6.0-rc0,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'