[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-5-g954cd54

2012-01-30 Thread James Page
The following commit has been merged in the master branch: commit 954cd5496cacfe86cbb06e1cb2155c6ccf61c064 Merge: 6f1f407b4f59763401f3e0c5eeac27d5f4915313 fecdc36a2083130af022046c6048feec7dfbcd8d Author: James Page Date: Mon Jan 30 19:30:55 2012 + Merge commit 'upstream/3.3.4+dfsg1'

[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-5-g954cd54

2012-01-30 Thread James Page
The following commit has been merged in the master branch: commit 59a09594315fea644aa301f633fb37221d6ed4de Author: James Page Date: Mon Jan 30 13:22:19 2012 + Sync changes from Ubuntu: * Sync changes from Ubuntu: - Switch zookeeperd upstart configuration to use start-stop

[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-2-5-g954cd54

2012-01-30 Thread James Page
The following commit has been merged in the master branch: commit 6f1f407b4f59763401f3e0c5eeac27d5f4915313 Author: James Page Date: Mon Jan 30 16:44:22 2012 + Updated spelling error in changelog diff --git a/debian/changelog b/debian/changelog index 70ae10a..4cdb31f 100644 --- a/debian