Juju Charms Collection
swift-proxy package

Merge lp://staging/~thedac/charms/trusty/swift-proxy/lp1522130 into lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next

  1. Trusty Tahr (14.04)
  2. lp1522130
  3. Merge into next
Proposed by David Ames
Status: Merged
Merged at revision: 129
Proposed branch: lp://staging/~thedac/charms/trusty/swift-proxy/lp1522130
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-proxy/next
Diff against target: 98 lines (+49/-9) (has conflicts)
3 files modified
charmhelpers/contrib/openstack/context.py (+6/-0)
charmhelpers/contrib/openstack/templates/haproxy.cfg (+16/-9)
config.yaml (+27/-0)
Text conflict in config.yaml
To merge this branch: bzr merge lp://staging/~thedac/charms/trusty/swift-proxy/lp1522130
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+279532@code.staging.launchpad.net

Description of the change

Fix bug #1522130

Add sane defaults for timeout connect and queue and make them configurable.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #14821 swift-proxy-next for thedac mp279532
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14821/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8140 swift-proxy-next for thedac mp279532
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8140/

lp://staging/~thedac/charms/trusty/swift-proxy/lp1522130 updated
126. By David Ames

Add haproxy context for new timeout values. Fix template whitespace

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #14032 swift-proxy-next for thedac mp279532
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/14032/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #15044 swift-proxy-next for thedac mp279532
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/15044/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #8213 swift-proxy-next for thedac mp279532
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8213/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches