[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, merge-tmp, created. debian/0.24.5-2-2-gb165f16

[Micah Anderson]

The branch, merge-tmp has been created
        at  b165f16ff587dde79bec2075f2218775b644af22 (commit)

- Shortlog ------------------------------------------------------------
commit b165f16ff587dde79bec2075f2218775b644af22
Merge: 4a78bb39c1b18d81890832892dafa4b89aed897e 4f88e7e841fc805ab08eb8044a371f223234399f
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Nov 27 22:14:27 2008 -0500

    Merge commit 'debian/0.24.5-2' into upstream/0.24.6
    
    Conflicts:
    	CHANGELOG
    	bin/puppet
    	bin/puppetca
    	conf/redhat/puppet.spec
    	conf/redhat/server.init
    	ext/puppetlast
    	install.rb
    	lib/puppet.rb
    	lib/puppet/indirector/yaml.rb
    	lib/puppet/metatype/evaluation.rb
    	lib/puppet/module.rb
    	lib/puppet/node.rb
    	lib/puppet/parser/functions.rb
    	lib/puppet/parser/grammar.ra
    	lib/puppet/parser/parser.rb
    	lib/puppet/parser/templatewrapper.rb
    	lib/puppet/provider/confine.rb
    	lib/puppet/provider/confine/variable.rb
    	lib/puppet/provider/nameservice/objectadd.rb
    	lib/puppet/provider/package/dpkg.rb
    	lib/puppet/provider/service/redhat.rb
    	lib/puppet/provider/ssh_authorized_key/parsed.rb
    	lib/puppet/provider/user/useradd.rb
    	lib/puppet/sslcertificates/support.rb
    	lib/puppet/type/ssh_authorized_key.rb
    	lib/puppet/util/ldap/connection.rb
    	lib/puppet/util/ldap/manager.rb
    	spec/integration/file_serving/metadata.rb
    	spec/integration/indirector/module_files.rb
    	spec/integration/indirector/rest.rb
    	spec/integration/network/server/mongrel.rb
    	spec/integration/network/server/webrick.rb
    	spec/integration/node.rb
    	spec/integration/node/catalog.rb
    	spec/integration/node/facts.rb
    	spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb
    	spec/shared_behaviours/file_server_terminus.rb
    	spec/shared_behaviours/file_serving.rb
    	spec/spec_helper.rb
    	spec/unit/file_serving/terminus_helper.rb
    	spec/unit/indirector/catalog/compiler.rb
    	spec/unit/indirector/direct_file_server.rb
    	spec/unit/indirector/file_metadata/modules.rb
    	spec/unit/indirector/file_server.rb
    	spec/unit/indirector/indirection.rb
    	spec/unit/indirector/ldap.rb
    	spec/unit/indirector/module_files.rb
    	spec/unit/indirector/node/ldap.rb
    	spec/unit/indirector/report/processor.rb
    	spec/unit/indirector/request.rb
    	spec/unit/indirector/yaml.rb
    	spec/unit/module.rb
    	spec/unit/network/client.rb
    	spec/unit/network/client/master.rb
    	spec/unit/network/http.rb
    	spec/unit/network/http/mongrel.rb
    	spec/unit/network/http/mongrel/rest.rb
    	spec/unit/network/http/webrick.rb
    	spec/unit/network/http/webrick/rest.rb
    	spec/unit/network/http_pool.rb
    	spec/unit/node.rb
    	spec/unit/node/catalog.rb
    	spec/unit/other/pgraph.rb
    	spec/unit/parser/collector.rb
    	spec/unit/parser/interpreter.rb
    	spec/unit/rails.rb
    	spec/unit/util/settings.rb
    	test/network/handler/master.rb

-----------------------------------------------------------------------

-- 
Puppet packaging for Debian