Merged in master and stable-2.11. I added a note to the commit message referencing the fix (6c737d05) in the lttng-ust tree.
Thanks! Jérémie On Tue, Apr 30, 2019 at 02:59:51PM -0400, Mathieu Desnoyers wrote: > Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com> > --- > src/bin/lttng-sessiond/lttng-ust-abi.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h > b/src/bin/lttng-sessiond/lttng-ust-abi.h > index 687eb0b2..40ba1f47 100644 > --- a/src/bin/lttng-sessiond/lttng-ust-abi.h > +++ b/src/bin/lttng-sessiond/lttng-ust-abi.h > @@ -44,8 +44,8 @@ > #define LTTNG_UST_COMM_MAGIC 0xC57C57C5 > > /* Version for ABI between liblttng-ust, sessiond, consumerd */ > -#define LTTNG_UST_ABI_MAJOR_VERSION 7 > -#define LTTNG_UST_ABI_MINOR_VERSION 2 > +#define LTTNG_UST_ABI_MAJOR_VERSION 8 > +#define LTTNG_UST_ABI_MINOR_VERSION 0 > > struct lttng_ust_calibrate; > > -- > 2.11.0 > _______________________________________________ lttng-dev mailing list lttng-dev@lists.lttng.org https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
