X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=.gitignore;h=acceec5ede434b8d1c42ce6b5f89dd0845efb66f;hb=fa184a4dbf3ee0ac1cc1001566031abbc7866f87;hp=68b258db8049c648b48a4f7e4a6be979a5425e1f;hpb=5b1163c6cf674c6461cc1e0ad1211924df7af789;p=lttng-ust.git

diff --git a/.gitignore b/.gitignore
index 68b258db..acceec5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,8 +71,6 @@ cscope.*
 /doc/man/lttng-ust.3
 /doc/man/tracef.3
 /doc/man/tracelog.3
-/doc/man/vtracef.3
-/doc/man/vtracelog.3
 /doc/man/lttng_ust_tracef.3
 /doc/man/lttng_ust_tracelog.3
 /doc/man/lttng_ust_vtracef.3
@@ -135,9 +133,14 @@ cscope.*
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/classnoinst.stamp
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/log4j-jni-header.stamp
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/classnoinst.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/log4j-jni-header.stamp
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/*.jar
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/META-INF
 /src/lib/lttng-ust-java-agent/jni/common/org_lttng_ust_agent_context_LttngContextApi.h
 /src/lib/lttng-ust-java-agent/jni/jul/org_lttng_ust_agent_jul_LttngJulApi.h
 /src/lib/lttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j_LttngLog4jApi.h
+/src/lib/lttng-ust-java-agent/jni/log4j/org_lttng_ust_agent_log4j2_LttngLog4j2Api.h
 /src/lib/lttng-ust-java/classnoinst.stamp
 /src/lib/lttng-ust-java/jni-header.stamp
 
@@ -155,6 +158,7 @@ cscope.*
 /doc/Makefile
 /doc/examples/Makefile
 /doc/man/Makefile
+/extras/Makefile
 /include/Makefile
 /src/common/Makefile
 /src/lib/lttng-ust-common/Makefile
@@ -169,10 +173,12 @@ cscope.*
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
 /src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
+/src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/Makefile
 /src/lib/lttng-ust-java-agent/jni/Makefile
 /src/lib/lttng-ust-java-agent/jni/common/Makefile
 /src/lib/lttng-ust-java-agent/jni/jul/Makefile
 /src/lib/lttng-ust-java-agent/jni/log4j/Makefile
+/src/lib/lttng-ust-java-agent/jni/log4j2/Makefile
 /src/lib/lttng-ust-java/Makefile
 /src/lib/lttng-ust-libc-wrapper/Makefile
 /src/lib/lttng-ust-pthread-wrapper/Makefile
@@ -211,3 +217,4 @@ cscope.*
 /tests/unit/ust-utils/Makefile
 /tests/utils/Makefile
 /tools/Makefile
+/bin/