Skip to content

Commit

Permalink
Fixes #2331
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Oct 11, 2023
1 parent 2c4b2a9 commit e31ff4c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Increment the:

## [Unreleased]

## [1.12.0] 2023-10-11

* [DEPRECATION] Deprecate ZPAGES
[#2291](https://github.com/open-telemetry/opentelemetry-cpp/pull/2291)
* [EXPORTER] Prometheus exporter emit resource attributes
Expand Down
4 changes: 2 additions & 2 deletions api/include/opentelemetry/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# define OPENTELEMETRY_ABI_VERSION_NO 1
#endif

#define OPENTELEMETRY_VERSION "1.11.0"
#define OPENTELEMETRY_VERSION "1.12.0"
#define OPENTELEMETRY_VERSION_MAJOR 1
#define OPENTELEMETRY_VERSION_MINOR 11
#define OPENTELEMETRY_VERSION_MINOR 12
#define OPENTELEMETRY_VERSION_PATCH 0

#define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
Expand Down
2 changes: 1 addition & 1 deletion docs/public/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'OpenTelemetry authors'

# The full version, including alpha/beta/rc tags
release = "1.11.0"
release = "1.12.0"

# Run sphinx on subprojects and copy output
# -----------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/version/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "opentelemetry/detail/preprocessor.h"

#define OPENTELEMETRY_SDK_VERSION "1.11.0"
#define OPENTELEMETRY_SDK_VERSION "1.12.0"

#include "opentelemetry/version.h"

Expand Down
8 changes: 4 additions & 4 deletions sdk/src/version/version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ namespace sdk
namespace version
{
const int major_version = 1;
const int minor_version = 11;
const int minor_version = 12;
const int patch_version = 0;
const char *pre_release = "NONE";
const char *build_metadata = "NONE";
const char *short_version = "1.11.0";
const char *full_version = "1.11.0-NONE-NONE";
const char *build_date = "Mon Aug 21 22:31:07 UTC 2023";
const char *short_version = "1.12.0";
const char *full_version = "1.12.0-NONE-NONE";
const char *build_date = "Wed 11 Oct 2023 06:36:17 PM UTC";

} // namespace version
} // namespace sdk
Expand Down

0 comments on commit e31ff4c

Please sign in to comment.