From: David Goulet <dgoulet@efficios.com>
Date: Thu, 24 Oct 2013 14:23:34 +0000 (-0400)
Subject: Merge branch 'master' into memleak-finder
X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=commitdiff_plain;h=8b833f70b3d3697e74c54f3a2f5efbe5292097ef;hp=-c

Merge branch 'master' into memleak-finder
---

8b833f70b3d3697e74c54f3a2f5efbe5292097ef
diff --combined .gitignore
index 96a1ab140,d8c993ef5..5d1e2ffa0
--- a/.gitignore
+++ b/.gitignore
@@@ -15,6 -15,7 +15,7 @@@ Makefile.i
  *.info
  *.bz2
  *.tar
+ .dirstamp
  configure
  aclocal.m4
  autom4te.cache/
@@@ -45,11 -46,10 +46,12 @@@ src/lib/lttng-ctl/filter/filter-parser.
  extras/bindings/swig/python/lttng.i
  extras/bindings/swig/python/lttng.py
  extras/bindings/swig/python/lttng_wrap.c
+ extras/core-handler/crash
  
  .checkpatch.conf
  
 +!memleak/Makefile
 +
  # Tests
  tests/unit/test_kernel_data
  tests/unit/test_session
@@@ -75,5 -75,6 +77,6 @@@ tests/regression/ust/exit-fast/exit-fas
  tests/regression/ust/fork/fork
  tests/regression/ust/fork/fork2
  tests/regression/ust/libc-wrapper/prog
+ tests/utils/testapp/gen-ust-nevents/gen-ust-nevents
  
  benchmark/