Update version to v2.0.0-rc4

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

diff --git a/ChangeLog b/ChangeLog
index 3b3bf314cefe2905275ae20f40706248392eceb5..22d3d4c9aad600d3820b13e99a503ccb8bbbe8ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2012-03-20 lttng-tools 2.0.0-rc4
+       * Fix: add small detail to enable-channel man page
+       * Fix: warned of arbitrary time for ust-nprocesses test
+       * Fix. add limitation to man page
+       * Fix: minor changes to lttng.1
+       * Fix: add exit values to lttng.1 man page
+       * Fix: add delay before validating apps in test nproc
+       * Fix: error handling in lttng enable-event
+       * Fix: document structure init. to 0 in lttng.h
+       * Fix: uninitialized variable
+       * Keep track of FD used for UST applications (v2)
+       * Fix: lttng view, error message and exit code
+       * Small fixes to lttng man pages (v2)
+       * Fix: handle EINTR for sendmsg syscall
+       * Fix: lttng UI exit value and error message
+       * Fix: session lock use after free
+       * Fix kernel_list_events memleaks
+       * Fix debug message use uninitialized variable
+       * Fix: trace_ust_destroy_metadata should check for NULL pointer
+       * Fix: various memleaks
+       * Fix: hash table allocation out of order on error
+       * fix: lttng_ht_destroy memleak
+
 2012-03-16 lttng-tools 2.0.0-rc3
        * Fix: missing headers for make dist
        * Fix: install lttng-consumerd in lib/lttng/libexec/

diff --git a/configure.ac b/configure.ac
index 61e14b7b1d6417c492dc8adf83c604b901718f87..6f1902245201ce9c25f93143ae232975129051fb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0.0-rc3],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.0-rc4],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -6,6 +6,9 @@ AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+AC_DEFINE_UNQUOTED([VERSION_NAME], "TBD", "")
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], "TBD", "")
+
 AC_CONFIG_HEADERS([include/config.h])
 
 AC_CHECK_HEADERS([ \

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 8ddba13f4384af3e069608d7f6b4340ea664389c..8d6c8e621e83eadd3d18a08e385ad0b474e98940 100644 (file)
--- a/src/bin/lttng/lttng.c
+++ b/src/bin/lttng/lttng.c
@@ -79,7 +79,7 @@ static struct cmd_struct commands[] =  {
 
 static void usage(FILE *ofp)
 {
-       fprintf(ofp, "LTTng Trace Control " VERSION"\n\n");
+       fprintf(ofp, "LTTng Trace Control " VERSION" - " VERSION_NAME"\n\n");
        fprintf(ofp, "usage: lttng [OPTIONS] <COMMAND>\n");
        fprintf(ofp, "\n");
        fprintf(ofp, "Options:\n");