The following commit has been merged in the master branch:
commit 8cb18c96c1dfc309a86da81bfebeb375b54afa63
Author: Patrick Winnertz <[email protected]>
Date: Tue Dec 7 12:57:09 2010 +0100
Revert "Add changelog entry for lenny backport"
This reverts commit c0df0f59a81149154ec357a5157df8ec4cbe3e57.
Conflicts:
debian/changelog
Signed-off-by: Patrick Winnertz <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 0a2c73b..0677ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ lustre (1.8.5+dpsg-1~1.gbp54a3db) UNRELEASED; urgency=low
-- Patrick Winnertz <[email protected]> Tue, 07 Dec 2010 12:55:30 +0100
-lustre (1.8.4-0.credativ.lenny.2) unstable; urgency=low
+lustre (1.8.4-1) unstable; urgency=low
* [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
git
--
Lustre Debian Packaging
_______________________________________________
Pkg-lustre-svn-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit
