Merge branch 'master' into benchmark

diff --cc .gitignore
index 776aa78efb241e8a68bdbd3f79ab2fcae0d8de6f,b63da96a36a43e2818f0a9d1e468947055c1516e..969e75ba5797c88b6da2cb1141c96d687b395fbe
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -34,14 -35,16 +35,16 @@@ src/bin/lttng-sessiond/lttng-session
  src/bin/lttng/lttng
  src/bin/lttng-consumerd/lttng-consumerd
  
- tests/test_sessions
- tests/test_kernel_data_trace
- tests/test_ust_data_trace
- tests/kernel_all_events_basic
- tests/kernel_event_basic
- tests/ust_global_all_events_basic
- tests/ust_global_event_basic
- tests/ust-nevents/gen-nevents
- tests/ust-nprocesses/gen-events-time
+ # Tests
+ test_sessions
+ test_kernel_data_trace
+ test_ust_data_trace
+ kernel_all_events_basic
+ kernel_event_basic
+ ust_global_all_events_basic
+ ust_global_event_basic
+ gen-nevents
+ gen-events-time
+ gen-events
  
 -benchmark/
 +benchmark/bench_sessions

diff --cc configure.ac
Simple merge