From b93bcf2662a8d231f788ad40a0fa677b72dfd22c Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Wed, 11 Nov 2020 14:58:21 -0800 Subject: [PATCH 1/4] Incrementing master CL and version to be above the next release from the feature branch --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd41787170..eb0c6bc507 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.1.0-beta.2 (Unreleased) +## 1.1.0-beta.3 (Unreleased) ### New Features From b13aba7647c7be054060101083bc7a333e0c2467 Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Wed, 11 Nov 2020 15:00:18 -0800 Subject: [PATCH 2/4] Increment version in version header. --- sdk/inc/azure/core/az_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/inc/azure/core/az_version.h b/sdk/inc/azure/core/az_version.h index 59372213f3..4c3e98cb04 100644 --- a/sdk/inc/azure/core/az_version.h +++ b/sdk/inc/azure/core/az_version.h @@ -17,7 +17,7 @@ /// The version in string format used for telemetry following the `semver.org` standard /// (https://semver.org). -#define AZ_SDK_VERSION_STRING "1.1.0-beta.2" +#define AZ_SDK_VERSION_STRING "1.1.0-beta.3" /// Major numeric identifier. #define AZ_SDK_VERSION_MAJOR 1 @@ -29,6 +29,6 @@ #define AZ_SDK_VERSION_PATCH 0 /// Optional pre-release identifier. SDK is in a pre-release state when present. -#define AZ_SDK_VERSION_PRERELEASE "beta.2" +#define AZ_SDK_VERSION_PRERELEASE "beta.3" #endif //_az_VERSION_H From a472cca3658b80723960bc50f3ad328076a2bd9c Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Wed, 11 Nov 2020 16:33:59 -0800 Subject: [PATCH 3/4] Bump to beta.4 to keep master ahead and unique compared to feature branches. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb0c6bc507..ecdd29118a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.1.0-beta.3 (Unreleased) +## 1.1.0-beta.4 (Unreleased) ### New Features From d26b8d38c5821b6c28011c6eb69ed256cff1e2b8 Mon Sep 17 00:00:00 2001 From: Ahson Khan Date: Wed, 11 Nov 2020 16:34:36 -0800 Subject: [PATCH 4/4] Make az version in master to beta 4, ahead of feature branches. --- sdk/inc/azure/core/az_version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/inc/azure/core/az_version.h b/sdk/inc/azure/core/az_version.h index 4c3e98cb04..015f0b08bd 100644 --- a/sdk/inc/azure/core/az_version.h +++ b/sdk/inc/azure/core/az_version.h @@ -17,7 +17,7 @@ /// The version in string format used for telemetry following the `semver.org` standard /// (https://semver.org). -#define AZ_SDK_VERSION_STRING "1.1.0-beta.3" +#define AZ_SDK_VERSION_STRING "1.1.0-beta.4" /// Major numeric identifier. #define AZ_SDK_VERSION_MAJOR 1 @@ -29,6 +29,6 @@ #define AZ_SDK_VERSION_PATCH 0 /// Optional pre-release identifier. SDK is in a pre-release state when present. -#define AZ_SDK_VERSION_PRERELEASE "beta.3" +#define AZ_SDK_VERSION_PRERELEASE "beta.4" #endif //_az_VERSION_H