From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8a6e7e24612924bde5764140ef875d18f29a97fa
Date: Wed, 26 Jun 2013 21:15:51 +0200 [thread overview]
Message-ID: <20130626191552.19F6E20621@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1827 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 8a6e7e24612924bde5764140ef875d18f29a97fa (commit)
via df49f08912dbb535403ead16c1a89a92ba3d7bc7 (commit)
from eac44f69edabee2200a5ad5ed34483a0afc2a788 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8a6e7e24612924bde5764140ef875d18f29a97fa
Merge: df49f08 eac44f6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 26 21:15:44 2013 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit df49f08912dbb535403ead16c1a89a92ba3d7bc7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 26 21:15:04 2013 +0200
systemd: Fix redundant conflict which confuses the solver.
-----------------------------------------------------------------------
Summary of changes:
systemd/systemd.nm | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Difference in files:
diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 5d971f9..ea7d6ea 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
name = systemd
version = 204
-release = 3
+release = 4
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
groups = System/Base
@@ -290,8 +290,6 @@ packages
end
conflicts
- nss-myhostname <= 0.3-3
-
# Ensure that the version of systemd matches systemd-libs.
systemd > %{thisver}
systemd < %{thisver}
hooks/post-receive
--
IPFire 3.x development tree
reply other threads:[~2013-06-26 19:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130626191552.19F6E20621@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox