[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/2.6.3-1-10-gcae5340

[Micah Anderson]

The following commit has been merged in the master branch:
commit b9eef3fe2a904364f03ab78d1215770fee67afa7
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 19:11:32 2010 -0500

    fix up the failed conflict resolution I did in e62a7007637d758ff2387c9c5d03651f75edffe4

diff --git a/debian/puppetmaster-common.puppetqd.default b/debian/puppetmaster-common.puppetqd.default
index a4c4e3e..b562bdc 100644
--- a/debian/puppetmaster-common.puppetqd.default
+++ b/debian/puppetmaster-common.puppetqd.default
@@ -15,7 +15,8 @@
 #  dbuser=puppet
 #  dbpassword=xxxx
 #  dblocation = /var/lib/puppet/storeconfigs.sqlite <-- only if using sqlite
-#  [puppetmasterd]
+#
+#  [master]
 #  async_storeconfigs = true
 #
 #  See: http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index b0a9fe4..4f02856 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -37,27 +37,3 @@ PUPPETMASTERS=1
 # 18140.
 PORT=8140
 
-# Should puppetqd (the storeconfigs queuing broker) be started? 
-#  This can take some load off of the puppetmaster by queuing the
-#  storeconfig updates to the database with puppetqd. You need
-#  to have the 'stompserver' package installed and running, and
-#  the following configured in your puppet.conf:
-#
-#  [main]
-#  queue_type = stomp
-#  queue_source = stomp://localhost:61613
-#  dbadapter = (sqlite3|mysql|postgresql)
-#  dbserver=localhost
-#  dbname=puppet
-#  dbuser=puppet
-#  dbpassword=xxxx
-#  dblocation = /var/lib/puppet/storeconfigs.sqlite <-- only if using sqlite
-#  [master]
-#  async_storeconfigs = true
-#
-#  See: http://reductivelabs.com/trac/puppet/wiki/UsingStoredConfiguration
-#
-#  Once you have the proper puppet.conf, and stompserver, you can enable
-#  the following:
-PUPPETQD=no
-PUPPETQD_OPTS=""

-- 
Puppet packaging for Debian