From mboxrd@z Thu Jan  1 00:00:00 1970
From: dgoulet@efficios.com (David Goulet)
Date: Fri, 25 Jan 2013 10:48:50 -0500
Subject: [lttng-dev] [PULL REQUEST lttng-tools] please pull for
	compudj-pull
In-Reply-To: <20130124234731.GA16402@Krystal>
References: <20130124234731.GA16402@Krystal>
Message-ID: <5102A962.4010105@efficios.com>

Merged!

Note that commit ec1406acb4af789da299b4e81b3b7f5cc0057714 has been
backported to stable-2.1.

Thanks!

Mathieu Desnoyers:
> Hi David,
> 
> Please pull from my pull branch at:
> 
> git://git.dorsal.polymtl.ca/~compudj/lttng-tools
> branch: compudj-pull
> 
> It contains the following useful commits:
> 
> commit 9d623b7096efbd378f566c39e4c9ab91e21fb656
> Author: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> Date:   Thu Jan 24 18:43:48 2013 -0500
> 
>     symbol prefixing: in-house copy of hash table
>     
>     Will ensure we don't clash with the real version in liburcu cds. It's
>     especially important since those symbols are exported globally by
>     liblttng-ctl.
>     
>     Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> 
> commit ec1406acb4af789da299b4e81b3b7f5cc0057714
> Author: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> Date:   Thu Jan 24 18:34:44 2013 -0500
> 
>     Fix: add missing unistd.h include for fdatasync in compat-fcntl.c
>     
>     Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> 
> commit 73f94c074aa293f09e526c01ed262a1751e10523
> Author: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> Date:   Thu Jan 24 18:33:41 2013 -0500
> 
>     namespace lttngctl filter flex/bison symbols
>     
>     Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> 
> Thanks,
> 
> Mathieu
>