git.liburcu.org Git - lttng-tools.git/commit

projects / lttng-tools.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5af3d17 3183dbb)

author	David Goulet <dgoulet@efficios.com>
	Fri, 27 Jan 2012 16:19:56 +0000 (11:19 -0500)
committer	David Goulet <dgoulet@efficios.com>
	Fri, 27 Jan 2012 16:19:56 +0000 (11:19 -0500)
commit	b194fbda4cc4a56ca5599d440d3e9340d2f50d00
tree	d755e8183e7b1def7898424e5a27deac62da3a59	tree \| snapshot
parent	5af3d17607cbce4ab708e633986d3d41f8d56814	commit \| diff
parent	3183dbb0b0a687ececcadb3be0cde938dc19f57a	commit \| diff

Merge branch 'master' into benchmark

Signed-off-by: David Goulet <dgoulet@efficios.com>

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
src/bin/lttng-sessiond/Makefile.am	\|	diff2 \|	blob \| history
src/bin/lttng-sessiond/main.c	\|	diff2 \|	blob \| history
src/bin/lttng-sessiond/shm.c	\|	diff2 \|	blob \| history

LTTng 2.0 tools and control repository

This page took 0.025576 seconds and 4 git commands to generate.