Merged in master and stable-2.10, thanks!

Jérémie

On 2 August 2017 at 14:26, Michael Jeanson <mjean...@efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjean...@efficios.com>
> ---
>  src/bin/lttng-sessiond/notification-thread-events.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/bin/lttng-sessiond/notification-thread-events.c 
> b/src/bin/lttng-sessiond/notification-thread-events.c
> index 327ea7f..1793cac 100644
> --- a/src/bin/lttng-sessiond/notification-thread-events.c
> +++ b/src/bin/lttng-sessiond/notification-thread-events.c
> @@ -469,7 +469,7 @@ int evaluate_condition_for_client(struct lttng_trigger 
> *trigger,
>         ret = evaluate_condition(condition, &evaluation, state, NULL,
>                         last_sample, channel_info->capacity);
>         if (ret) {
> -               WARN("[notification-thread] Fatal error occured while 
> evaluating a newly subscribed-to condition");
> +               WARN("[notification-thread] Fatal error occurred while 
> evaluating a newly subscribed-to condition");
>                 goto end;
>         }
>
> --
> 2.7.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to