~ubuntu-branches/ubuntu/quantal/mcollective/quantal

Viewing all changes in revision 17.

  • Committer: Package Import Robot
  • Author(s): Marc Cluet
  • Date: 2012-06-06 14:18:14 UTC
  • mfrom: (1.1.5) (0.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20120606141814-aeqkb45avnq0sio4
Tags: 2.0.0+dfsg-1ubuntu1
* Merge from debian unstable, remaning 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.postinst: Fixed tabs
  - debian/mcollective.upstart: Added upstart file
 * Added checks to avoid starting when RUN=no and when daemonize=1 
   on the config file (incompatible with upstart script)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: