[Debian-ha-commits] [resource-agents] 01/02: Revert "Ship upstream configuration as default."

[Adrian Vondendriesch]

This is an automated email from the git hooks/post-receive script.

discostu-guest pushed a commit to branch master
in repository resource-agents.

commit 4e850d5d7933e44ff2fbe45b60eee0e367e4de07
Author: Adrian Vondendriesch <adrian.vondendriesch at credativ.de>
Date:   Sun Mar 13 12:20:18 2016 +0100

    Revert "Ship upstream configuration as default."
    
    This reverts commit 986bc2b7a25ef79d55aa6dcdfae060016e436b8a.
    
    Instead of shipping the upstream configuration we ship a very simple dummy
    configuration. See next commit.
---
 debian/changelog          | 7 -------
 debian/ldirectord.install | 1 -
 2 files changed, 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 086547e..3932f71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-resource-agents (1:3.9.7-2) unstable; urgency=medium
-
-  * debian/ldirectord.install: Ship upstream ldirectord.cf as default config
-    Otherwise the installation fails. (Closes: #817117)
-
- -- Adrian Vondendriesch <adrian.vondendriesch at credativ.de>  Sat, 12 Mar 2016 12:27:38 +0100
-
 resource-agents (1:3.9.7-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/ldirectord.install b/debian/ldirectord.install
index 024e16d..3a6b53d 100644
--- a/debian/ldirectord.install
+++ b/debian/ldirectord.install
@@ -4,4 +4,3 @@ etc/logrotate.d/ldirectord
 usr/sbin/ldirectord
 usr/share/man/man8/ldirectord.8
 lib/systemd/system/
-ldirectord/ldirectord.cf etc/ha.d
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/resource-agents.git