Merge into quantal : mcollective20 : Quantal (12.10) : Code : mcollective package : Ubuntu

Status:	Merged
Merge reported by:	Stefano Rivera
Merged at revision:	not available
Proposed branch:	lp://staging/~lynxman/ubuntu/quantal/mcollective/mcollective20
Merge into:	lp://staging/ubuntu/quantal/mcollective
Diff against target:	54351 lines (+22099/-24786) 320 files modified .pc/applied-patches (+0/-1) .pc/pluginsdir.patch/etc/client.cfg.dist (+0/-21) .pc/pluginsdir.patch/etc/server.cfg.dist (+0/-22) bin/mc-call-agent (+54/-0) bin/mco (+37/-0) bin/mcollectived (+49/-0) debian/README.source (+1/-1) debian/changelog (+30/-0) debian/control (+11/-16) debian/copyright (+7/-7) debian/mcollective-client.config (+0/-9) debian/mcollective-client.templates (+0/-11) debian/mcollective-common.NEWS (+10/-0) debian/mcollective-common.templates (+23/-12) debian/mcollective.README.Debian (+13/-0) debian/mcollective.postinst (+52/-52) debian/mcollective.templates (+12/-2) debian/mcollective.upstart (+15/-0) debian/patches/pluginsdir.patch (+13/-28) debian/po/nl.po (+109/-0) doc/classes/Array.html (+41/-35) doc/classes/Dir.html (+212/-0) doc/classes/MCollective.html (+137/-227) doc/classes/MCollective/Agent.html (+0/-116) doc/classes/MCollective/Agent/Discovery.html (+0/-251) doc/classes/MCollective/Agent/Rpcutil.html (+0/-111) doc/classes/MCollective/Agents.html (+260/-164) doc/classes/MCollective/Application.html (+621/-387) doc/classes/MCollective/Application/Controller.html (+0/-270) doc/classes/MCollective/Application/Facts.html (+0/-252) doc/classes/MCollective/Application/Find.html (+0/-155) doc/classes/MCollective/Application/Help.html (+0/-182) doc/classes/MCollective/Application/Inventory.html (+0/-798) doc/classes/MCollective/Application/Ping.html (+0/-167) doc/classes/MCollective/Application/Rpc.html (+0/-268) doc/classes/MCollective/Applications.html (+152/-140) doc/classes/MCollective/Client.html (+375/-306) doc/classes/MCollective/Config.html (+241/-183) doc/classes/MCollective/Connector.html (+4/-10) doc/classes/MCollective/Connector/Base.html (+9/-11) doc/classes/MCollective/Connector/Stomp.html (+0/-488) doc/classes/MCollective/Facts.html (+30/-41) doc/classes/MCollective/Facts/Bar.html (+0/-113) doc/classes/MCollective/Facts/Base.html (+91/-93) doc/classes/MCollective/Facts/Testfacts.html (+0/-115) doc/classes/MCollective/Facts/Yaml_facts.html (+0/-247) doc/classes/MCollective/Foo.html (+0/-113) doc/classes/MCollective/Log.html (+144/-146) doc/classes/MCollective/Logger.html (+4/-8) doc/classes/MCollective/Logger/Base.html (+35/-37) doc/classes/MCollective/Logger/Console_logger.html (+80/-80) doc/classes/MCollective/Logger/File_logger.html (+50/-50) doc/classes/MCollective/Logger/Syslog_logger.html (+112/-80) doc/classes/MCollective/Matcher.html (+138/-0) doc/classes/MCollective/Matcher/Parser.html (+270/-0) doc/classes/MCollective/Matcher/Scanner.html (+242/-0) doc/classes/MCollective/Message.html (+676/-0) doc/classes/MCollective/MsgDoesNotMatchRequestID.html (+2/-2) doc/classes/MCollective/MsgTTLExpired.html (+111/-0) doc/classes/MCollective/Optionparser.html (+193/-133) doc/classes/MCollective/PluginManager.html (+246/-128) doc/classes/MCollective/PluginPackager.html (+335/-0) doc/classes/MCollective/PluginPackager/AgentDefinition.html (+389/-0) doc/classes/MCollective/PluginPackager/StandardDefinition.html (+336/-0) doc/classes/MCollective/RPC.html (+199/-209) doc/classes/MCollective/RPC/ActionRunner.html (+177/-147) doc/classes/MCollective/RPC/Agent.html (+194/-131) doc/classes/MCollective/RPC/Audit.html (+7/-9) doc/classes/MCollective/RPC/Client.html (+651/-372) doc/classes/MCollective/RPC/DDL.html (+269/-257) doc/classes/MCollective/RPC/Helpers.html (+412/-294) doc/classes/MCollective/RPC/Logfile.html (+0/-168) doc/classes/MCollective/RPC/Progress.html (+49/-51) doc/classes/MCollective/RPC/Reply.html (+87/-89) doc/classes/MCollective/RPC/Request.html (+68/-70) doc/classes/MCollective/RPC/Result.html (+67/-40) doc/classes/MCollective/RPC/Stats.html (+240/-242) doc/classes/MCollective/Registration.html (+2/-9) doc/classes/MCollective/Registration/Agentlist.html (+0/-154) doc/classes/MCollective/Registration/Base.html (+166/-44) doc/classes/MCollective/Request.html (+0/-172) doc/classes/MCollective/Runner.html (+64/-111) doc/classes/MCollective/RunnerStats.html (+106/-78) doc/classes/MCollective/SSL.html (+387/-260) doc/classes/MCollective/Security.html (+2/-31) doc/classes/MCollective/Security/Aes_security.html (+0/-733) doc/classes/MCollective/Security/Base.html (+376/-279) doc/classes/MCollective/Security/Psk.html (+0/-335) doc/classes/MCollective/Security/Sshkey.html (+0/-395) doc/classes/MCollective/Security/Ssl.html (+0/-420) doc/classes/MCollective/Shell.html (+65/-67) doc/classes/MCollective/UnixDaemon.html (+198/-0) doc/classes/MCollective/Util.html (+430/-353) doc/classes/MCollective/Vendor.html (+0/-248) doc/classes/MCollective/WindowsDaemon.html (+204/-0) doc/classes/Object.html (+0/-148) doc/classes/Symbol.html (+9/-11) doc/created.rid (+1/-1) doc/files/ext/mc-rpc-restserver_rb.html (+0/-125) doc/files/lib/mcollective/agents_rb.html (+1/-1) doc/files/lib/mcollective/application_rb.html (+1/-1) doc/files/lib/mcollective/applications_rb.html (+1/-1) doc/files/lib/mcollective/client_rb.html (+1/-1) doc/files/lib/mcollective/config_rb.html (+1/-1) doc/files/lib/mcollective/connector/base_rb.html (+1/-1) doc/files/lib/mcollective/connector_rb.html (+1/-1) doc/files/lib/mcollective/facts/base_rb.html (+1/-1) doc/files/lib/mcollective/facts_rb.html (+1/-1) doc/files/lib/mcollective/log_rb.html (+1/-1) doc/files/lib/mcollective/logger/base_rb.html (+1/-1) doc/files/lib/mcollective/logger/console_logger_rb.html (+1/-1) doc/files/lib/mcollective/logger/file_logger_rb.html (+1/-1) doc/files/lib/mcollective/logger/syslog_logger_rb.html (+1/-1) doc/files/lib/mcollective/logger_rb.html (+1/-1) doc/files/lib/mcollective/matcher/parser_rb.html (+101/-0) doc/files/lib/mcollective/matcher/scanner_rb.html (+101/-0) doc/files/lib/mcollective/matcher_rb.html (+101/-0) doc/files/lib/mcollective/message_rb.html (+101/-0) doc/files/lib/mcollective/monkey_patches_rb.html (+14/-1) doc/files/lib/mcollective/optionparser_rb.html (+1/-1) doc/files/lib/mcollective/pluginmanager_rb.html (+1/-1) doc/files/lib/mcollective/pluginpackager/agent_definition_rb.html (+101/-0) doc/files/lib/mcollective/pluginpackager/standard_definition_rb.html (+101/-0) doc/files/lib/mcollective/pluginpackager_rb.html (+101/-0) doc/files/lib/mcollective/registration/base_rb.html (+1/-1) doc/files/lib/mcollective/registration_rb.html (+1/-1) doc/files/lib/mcollective/request_rb.html (+0/-101) doc/files/lib/mcollective/rpc/actionrunner_rb.html (+1/-1) doc/files/lib/mcollective/rpc/agent_rb.html (+1/-1) doc/files/lib/mcollective/rpc/audit_rb.html (+1/-1) doc/files/lib/mcollective/rpc/client_rb.html (+1/-1) doc/files/lib/mcollective/rpc/ddl_rb.html (+1/-1) doc/files/lib/mcollective/rpc/helpers_rb.html (+1/-1) doc/files/lib/mcollective/rpc/progress_rb.html (+1/-1) doc/files/lib/mcollective/rpc/reply_rb.html (+1/-1) doc/files/lib/mcollective/rpc/request_rb.html (+1/-1) doc/files/lib/mcollective/rpc/result_rb.html (+1/-1) doc/files/lib/mcollective/rpc/stats_rb.html (+1/-1) doc/files/lib/mcollective/rpc_rb.html (+1/-1) doc/files/lib/mcollective/runner_rb.html (+1/-1) doc/files/lib/mcollective/runnerstats_rb.html (+1/-1) doc/files/lib/mcollective/security/base_rb.html (+1/-1) doc/files/lib/mcollective/security_rb.html (+1/-1) doc/files/lib/mcollective/shell_rb.html (+1/-1) doc/files/lib/mcollective/ssl_rb.html (+2/-1) doc/files/lib/mcollective/unix_daemon_rb.html (+101/-0) doc/files/lib/mcollective/util_rb.html (+1/-1) doc/files/lib/mcollective/vendor_rb.html (+0/-108) doc/files/lib/mcollective/windows_daemon_rb.html (+108/-0) doc/files/lib/mcollective_rb.html (+4/-2) doc/files/mcollectived_rb.html (+0/-109) doc/files/plugins/mcollective/agent/discovery_rb.html (+0/-101) doc/files/plugins/mcollective/agent/rpcutil_rb.html (+0/-101) doc/files/plugins/mcollective/application/controller_rb.html (+0/-109) doc/files/plugins/mcollective/application/facts_rb.html (+0/-101) doc/files/plugins/mcollective/application/find_rb.html (+0/-101) doc/files/plugins/mcollective/application/help_rb.html (+0/-101) doc/files/plugins/mcollective/application/inventory_rb.html (+0/-108) doc/files/plugins/mcollective/application/ping_rb.html (+0/-101) doc/files/plugins/mcollective/application/rpc_rb.html (+0/-101) doc/files/plugins/mcollective/audit/logfile_rb.html (+0/-108) doc/files/plugins/mcollective/connector/stomp_rb.html (+0/-108) doc/files/plugins/mcollective/facts/yaml_facts_rb.html (+0/-108) doc/files/plugins/mcollective/registration/agentlist_rb.html (+0/-101) doc/files/plugins/mcollective/security/aes_security_rb.html (+0/-101) doc/files/plugins/mcollective/security/psk_rb.html (+0/-108) doc/files/plugins/mcollective/security/sshkey_rb.html (+0/-111) doc/files/plugins/mcollective/security/ssl_rb.html (+0/-109) doc/files/spec/monkey_patches/instance_variable_defined_rb.html (+0/-101) doc/files/spec/spec_helper_rb.html (+0/-115) doc/files/spec/unit/application_spec_rb.html (+0/-101) doc/files/spec/unit/applications_spec_rb.html (+0/-101) doc/files/spec/unit/config_spec_rb.html (+0/-101) doc/files/spec/unit/facts/base_spec_rb.html (+0/-101) doc/files/spec/unit/facts_spec_rb.html (+0/-101) doc/files/spec/unit/log_spec_rb.html (+0/-101) doc/files/spec/unit/logger/base_spec_rb.html (+0/-101) doc/files/spec/unit/optionparser_spec_rb.html (+0/-101) doc/files/spec/unit/pluginmanager_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/actionrunner_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/agent_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/reply_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/request_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/result_spec_rb.html (+0/-101) doc/files/spec/unit/rpc/stats_spec_rb.html (+0/-101) doc/files/spec/unit/security/base_spec_rb.html (+0/-101) doc/files/spec/unit/security/psk_spec_rb.html (+0/-101) doc/files/spec/unit/shell_spec_rb.html (+0/-101) doc/files/spec/unit/ssl_spec_rb.html (+0/-101) doc/files/spec/unit/util_spec_rb.html (+0/-101) doc/files/spec/unit/vendor_spec_rb.html (+0/-101) doc/fr_class_index.html (+11/-24) doc/fr_file_index.html (+9/-44) doc/fr_method_index.html (+319/-325) doc/index.html (+2/-2) etc/client.cfg.dist (+5/-5) etc/server.cfg.dist (+3/-3) ext/Makefile (+3/-3) ext/activemq/examples/multi-broker-mesh/README (+0/-21) ext/activemq/examples/multi-broker-mesh/broker1-activemq.xml (+0/-76) ext/activemq/examples/multi-broker-mesh/broker2-activemq.xml (+0/-75) ext/activemq/examples/multi-broker-mesh/broker3-activemq.xml (+0/-71) ext/activemq/examples/multi-broker/README (+3/-3) ext/activemq/examples/multi-broker/broker1-activemq.xml (+97/-37) ext/activemq/examples/multi-broker/broker2-activemq.xml (+40/-34) ext/activemq/examples/multi-broker/broker3-activemq.xml (+40/-34) ext/activemq/examples/single-broker/README (+1/-1) ext/activemq/examples/single-broker/activemq.xml (+19/-3) ext/debian/changelog (+0/-12) ext/debian/mcollective-client.install (+2/-0) ext/debian/mcollective-common.install (+7/-1) ext/debian/mcollective.init (+85/-0) ext/debian/mcollective.install (+0/-1) ext/debian/patches/conffile.dpatch (+8/-8) ext/debian/patches/pluginsdir.dpatch (+2/-2) ext/mc-rpc-restserver.rb (+12/-12) ext/redhat/mcollective.init (+139/-0) ext/redhat/mcollective.spec (+131/-0) ext/solaris/README (+23/-8) ext/solaris/build (+8/-4) ext/stompclient (+0/-2) ext/windows/README.md (+34/-0) ext/windows/environment.bat (+16/-0) ext/windows/mco.bat (+7/-0) ext/windows/register_service.bat (+7/-0) ext/windows/service_manager.rb (+94/-0) ext/windows/unregister_service.bat (+7/-0) lib/mcollective.rb (+48/-43) lib/mcollective/agents.rb (+158/-127) lib/mcollective/application.rb (+352/-254) lib/mcollective/applications.rb (+143/-129) lib/mcollective/client.rb (+290/-264) lib/mcollective/config.rb (+200/-170) lib/mcollective/connector.rb (+16/-17) lib/mcollective/connector/base.rb (+21/-23) lib/mcollective/facts.rb (+37/-38) lib/mcollective/facts/base.rb (+83/-83) lib/mcollective/log.rb (+100/-102) lib/mcollective/logger.rb (+3/-3) lib/mcollective/logger/base.rb (+70/-70) lib/mcollective/logger/console_logger.rb (+58/-58) lib/mcollective/logger/file_logger.rb (+41/-41) lib/mcollective/logger/syslog_logger.rb (+50/-38) lib/mcollective/matcher.rb (+16/-0) lib/mcollective/matcher/parser.rb (+93/-0) lib/mcollective/matcher/scanner.rb (+123/-0) lib/mcollective/message.rb (+201/-0) lib/mcollective/monkey_patches.rb (+102/-7) lib/mcollective/optionparser.rb (+162/-137) lib/mcollective/pluginmanager.rb (+178/-118) lib/mcollective/pluginpackager.rb (+61/-0) lib/mcollective/pluginpackager/agent_definition.rb (+86/-0) lib/mcollective/pluginpackager/standard_definition.rb (+66/-0) lib/mcollective/registration.rb (+14/-15) lib/mcollective/registration/base.rb (+72/-49) lib/mcollective/request.rb (+0/-15) lib/mcollective/rpc.rb (+184/-166) lib/mcollective/rpc/actionrunner.rb (+139/-127) lib/mcollective/rpc/agent.rb (+438/-389) lib/mcollective/rpc/audit.rb (+34/-35) lib/mcollective/rpc/client.rb (+790/-541) lib/mcollective/rpc/ddl.rb (+255/-243) lib/mcollective/rpc/helpers.rb (+336/-266) lib/mcollective/rpc/progress.rb (+60/-62) lib/mcollective/rpc/reply.rb (+57/-58) lib/mcollective/rpc/request.rb (+48/-49) lib/mcollective/rpc/result.rb (+38/-30) lib/mcollective/rpc/stats.rb (+182/-184) lib/mcollective/runner.rb (+129/-155) lib/mcollective/runnerstats.rb (+88/-80) lib/mcollective/security.rb (+24/-25) lib/mcollective/security/base.rb (+234/-183) lib/mcollective/shell.rb (+85/-85) lib/mcollective/ssl.rb (+241/-196) lib/mcollective/unix_daemon.rb (+37/-0) lib/mcollective/util.rb (+272/-256) lib/mcollective/vendor.rb (+37/-37) lib/mcollective/windows_daemon.rb (+25/-0) mc-call-agent (+0/-56) mc-controller (+0/-16) mc-facts (+0/-16) mc-find-hosts (+0/-12) mc-inventory (+0/-16) mc-ping (+0/-16) mc-rpc (+0/-16) mco (+0/-26) mcollective.init (+0/-3) mcollective.init-rh (+0/-107) mcollective.spec (+0/-127) mcollectived.rb (+0/-61) plugins/mcollective/agent/discovery.rb (+71/-69) plugins/mcollective/agent/rpcutil.ddl (+4/-0) plugins/mcollective/agent/rpcutil.rb (+93/-93) plugins/mcollective/application/controller.rb (+78/-78) plugins/mcollective/application/facts.rb (+51/-49) plugins/mcollective/application/find.rb (+13/-11) plugins/mcollective/application/help.rb (+23/-24) plugins/mcollective/application/inventory.rb (+327/-350) plugins/mcollective/application/ping.rb (+76/-28) plugins/mcollective/application/plugin.rb (+192/-0) plugins/mcollective/application/rpc.rb (+138/-107) plugins/mcollective/audit/logfile.rb (+21/-22) plugins/mcollective/connector/activemq.rb (+401/-0) plugins/mcollective/connector/stomp.rb (+336/-226) plugins/mcollective/facts/yaml_facts.rb (+58/-59) plugins/mcollective/pluginpackager/debpackage_packager.rb (+137/-0) plugins/mcollective/pluginpackager/ospackage_packager.rb (+59/-0) plugins/mcollective/pluginpackager/rpmpackage_packager.rb (+85/-0) plugins/mcollective/pluginpackager/templates/debian/Makefile.erb (+7/-0) plugins/mcollective/pluginpackager/templates/debian/changelog.erb (+5/-0) plugins/mcollective/pluginpackager/templates/debian/compat.erb (+1/-0) plugins/mcollective/pluginpackager/templates/debian/control.erb (+11/-0) plugins/mcollective/pluginpackager/templates/debian/copyright.erb (+8/-0) plugins/mcollective/pluginpackager/templates/debian/rules.erb (+6/-0) plugins/mcollective/pluginpackager/templates/redhat/rpm_spec.erb (+43/-0) plugins/mcollective/registration/agentlist.rb (+7/-8) plugins/mcollective/security/aes_security.rb (+326/-255) plugins/mcollective/security/psk.rb (+114/-111) plugins/mcollective/security/sshkey.rb (+0/-153) plugins/mcollective/security/ssl.rb (+322/-276)
To merge this branch:	bzr merge lp://staging/~lynxman/ubuntu/quantal/mcollective/mcollective20
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Stefano Rivera		Needs Fixing on 2012-06-04
Jamie Strandboge		Needs Fixing on 2012-05-30
Ubuntu branches	2012-05-29	Pending
Review via email: mp+107792@code.staging.launchpad.net

Description of the change

mcollective (2.0.0+dfsg-1ubuntu1) quantal; urgency=low

  * Merge from debian unstable, remaining changes
    - debian/control: Package mcollective-middleware allows the user
      to install mcollective + his AMPQ server of choice, we now
      choose activemq by default but support for rabbitmq-stomp is
      also integrated
    - debian/mcollective.postinst: Added fix for mcollective server.cfg to
      avoid daemonize if running on system with upstart
    - debian/mcollective.upstart: Added support to respect default file
      behaviour and check on daemonize option in config file

-- Marc Cluet <email address hidden> Tue, 29 May 2012 14:52:36 +0100

Revision history for this message

Jamie Strandboge (jdstrand) wrote on 2012-05-30:

#

Thanks for the merge. The debian/changelog ommitted the changes in 1.2.1+dfsg-2ubuntu1. I then diffed the package against the version in Debian, and discovered the following undocumented changes:
* debian/mcollective-client.config is added
* debian/mcollective-client.templates is added
* debian/mcollective-middleware.postinst is added
* debian/mcollective-middleware.postrm is added
* debian/patches/drop-init-script.patch
* debian/patches/nodaemonize.server.patch

Can you update debian/changelog for the above? That will make it much easier to know what was changed and to review in the future. Thanks!

review: Needs Fixing

Revision history for this message

Marc Cluet (lynxman) wrote on 2012-05-31:

#

Hi Jamie,

I've just fixed all the changes and did a proper merge using the method suggested by James Page, this should be all OK now and the branch has been rewritten.

Revision history for this message

Stefano Rivera (stefanor) wrote on 2012-06-04:

#

I still see several undocumented changes:
* Updating README.Debian and dependencies to mention libsystemu-ruby instead of ruby-systemu (which looks wrong btw)
* Updating dependencies from ruby-stomp to libruby-stop (again, looks wrong)
* Rewording package descriptions
* Rewording mcollective-common and mcollective debconf questions
* Changing tabs to spaces in debian/mcollective.postinst (one wonders why)
* Pointing libdir at /usr/libexec (err, why? We don't usually use /usr/libexec)

review: Needs Fixing

Revision history for this message

Stefano Rivera (stefanor) wrote on 2012-06-04:

#

Marking this merge proposal as work-in-progress to remove it from the sponsorship queue. Please set it back to "Nedes Review" when it's ready to be reviewed again.

Revision history for this message

Marc Cluet (lynxman) wrote on 2012-06-06:

#

Fixed stefano's suggestions:

* Changed dependency for libstomp-ruby to ruby-stomp
* Changed dependency for libsystemu-ruby to ruby-systemu
* Used debian templates for mcollective and mcollective-common debconf questions
* Removed unnecessary templates for mcollective-client debconf questions

About the ones I didn't change

* Rewording package descriptions
Package descriptions were overwritten with the ones chosen by Debian to narrow the delta
* Pointing libdir at /usr/libexec (err, why? We don't usually use /usr/libexec)
/usr/libexec is the default location for mcollective, even if bizarre it's compatible across all platforms. It's also working this way in other Linux distributions and its the way upstream recommends as well, I wouldn't change it unless there was a very very good reason to do so.

lp://staging/~lynxman/ubuntu/quantal/mcollective/mcollective20 updated on 2012-06-06

21. By Marc Cluet on 2012-06-06: Minor changelog fixes
22. By Marc Cluet on 2012-06-06: Fixed descriptions in control file to show debian descriptions

Ubuntu
mcollective package

Merge lp://staging/~lynxman/ubuntu/quantal/mcollective/mcollective20 into lp://staging/ubuntu/quantal/mcollective

Commit message

Description of the change

Preview Diff

Subscribers

Ubuntumcollective package

Merge lp://staging/~lynxman/ubuntu/quantal/mcollective/mcollective20 into lp://staging/ubuntu/quantal/mcollective

Commit message

Description of the change

Preview Diff

Subscribers

Ubuntu
mcollective package