Merged in master, stable-2.8 and stable-2.7. Thanks!

Jérémie

On Tue, Apr 19, 2016 at 4:34 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  src/bin/lttng-consumerd/lttng-consumerd.c | 2 +-
>  src/common/consumer/consumer.c            | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
> index 87ffb05..00660fc 100644
> --- a/src/bin/lttng-consumerd/lttng-consumerd.c
> +++ b/src/bin/lttng-consumerd/lttng-consumerd.c
> @@ -101,7 +101,7 @@ static void sighandler(int sig)
>
>         /*
>          * Ignore SIGPIPE because it should not stop the consumer whenever a
> -        * SIGPIPE is catched through a FD operation.
> +        * SIGPIPE is caught through a FD operation.
>          */
>         if (sig == SIGPIPE) {
>                 return;
> diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
> index d57271c..cb05a1e 100644
> --- a/src/common/consumer/consumer.c
> +++ b/src/common/consumer/consumer.c
> @@ -2261,10 +2261,10 @@ restart:
>                 DBG("Metadata poll return from wait with %d fd(s)",
>                                 LTTNG_POLL_GETNB(&events));
>                 health_poll_exit();
> -               DBG("Metadata event catched in thread");
> +               DBG("Metadata event caught in thread");
>                 if (ret < 0) {
>                         if (errno == EINTR) {
> -                               ERR("Poll EINTR catched");
> +                               ERR("Poll EINTR caught");
>                                 goto restart;
>                         }
>                         if (LTTNG_POLL_GETNB(&events) == 0) {
> @@ -2844,10 +2844,10 @@ restart:
>                 DBG("Channel poll return from wait with %d fd(s)",
>                                 LTTNG_POLL_GETNB(&events));
>                 health_poll_exit();
> -               DBG("Channel event catched in thread");
> +               DBG("Channel event caught in thread");
>                 if (ret < 0) {
>                         if (errno == EINTR) {
> -                               ERR("Poll EINTR catched");
> +                               ERR("Poll EINTR caught");
>                                 goto restart;
>                         }
>                         if (LTTNG_POLL_GETNB(&events) == 0) {
> --
> 2.7.4
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com