Merge lp:~ev/uci-engine/drop-bsb-4g-ram into lp:uci-engine

[Evan]

Drop the 4G of RAM constraint for the BSB. This isn't needed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:840
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1575/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/1575/rebuild

review: Approve (continuous-integration)

[Vincent Ladeuil (vila)]

Straightforward.

review: Approve

[Francis Ginther (fginther)]

Ditto. +1

review: Approve

[Ubuntu CI Bot (uci-bot)]

The attempt to merge lp:~ev/uci-engine/drop-bsb-4g-ram into lp:uci-engine failed. Below is the output from the failed tests.

ERROR:root:/var/lib/lxc not mounted.

[Ubuntu CI Bot (uci-bot)]

Attempt to merge into lp:uci-engine failed due to conflicts:

text conflict in juju-deployer/branch-source-builder.yaml.tmpl

[Evan (ev)]

Superseded by another branch.

Unmerged revisions

840. By Evan on 2014-10-13

Drop the 4G of RAM constraint for the BSB. This isn't needed.

=== modified file 'juju-deployer/branch-source-builder.yaml.tmpl'
--- juju-deployer/branch-source-builder.yaml.tmpl	2014-10-10 10:00:49 +0000
+++ juju-deployer/branch-source-builder.yaml.tmpl	2014-10-13 11:20:34 +0000
@@ -3,7 +3,6 @@
     services:
         ci-airline-bsb-worker:
             charm: rabbitmq-worker
-            constraints: "mem=4096M"
             options:
                 main: ./run-python ./branch-source-builder/bsbuilder/run_worker.py
                 current_code: ${CI_PAYLOAD_URL}