Merge branch 'master' into benchmark

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 660c877394dd926258e98c1a98d1963ad7969acf..79d0a02c5f587c3a00748b5a5063b1ef3bc9abce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,13 +30,14 @@ config/
 !config/epoll.m4
 !config/config_feature.m4
 
-ltt-sessiond/ltt-sessiond
+lttng-sessiond/lttng-sessiond
 lttng/lttng
-ltt-kconsumerd/ltt-kconsumerd
+lttng-kconsumerd/lttng-kconsumerd
+lttng-consumerd/lttng-consumerd
 
 tests/test_sessions
 tests/test_kernel_data_trace
 tests/kernel_all_events_basic
 tests/kernel_event_basic
 
-benchmark/
+benchmark/bench_sessions