[systemd-commits] 2 commits - .mailmap Makefile.am

[Zbigniew Jędrzejewski-Szmek]

 .mailmap    |   10 ++++++++++
 Makefile.am |    2 ++
 2 files changed, 12 insertions(+)

New commits:
commit 06637f8bd1ceb6dc567d3a79a6b9745376797352
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 29 23:01:01 2013 -0500

    build-sys: add rules for sd_journal_{get,set}_data_threshold(3)
    
    Fixup for 350b6a65.

diff --git a/Makefile.am b/Makefile.am
index 33d96e8..4422eb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -740,6 +740,8 @@ man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
 man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
+man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
 man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
 man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
 man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3

commit decc5aa90d5a5c561c9da97ec188033e9ef629ba
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Jan 29 21:31:41 2013 -0500

    Add a few entries to .mailmap

diff --git a/.mailmap b/.mailmap
index 12fb2c8..ddaf4d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -50,3 +50,13 @@ Ted Ts'o <tytso at mit.edu>
 Tobias Klauser <tklauser at access.unizh.ch>
 Tobias Klauser <tklauser at access.unizh.ch> <tklauser at access.unizh.chbk>
 Tobias Klauser <tklauser at access.unizh.ch> <klauser at access.unizh.ch>
+Patrick Mansfield <patmans at us.ibm.com>
+Christophe Varoqui <christophe.varoqui at free.fr>
+Daniel Stekloff <dsteklof at us.ibm.com>
+Michael Buesch <mbuesch at freenet.de>
+Olaf Hering <olh at suse.de>
+Robert Love <rml at tech9.net>
+Arnd Bergmann <arnd at arndb.de>
+Tom Rini <trini at kernel.crashing.org>
+Paul Mundt <lethal at linux-sh.org>
+Atul Sabharwal <atul.sabharwal at intel.com>