lp:~openstack-charmers/charms/precise/swift-proxy/ha-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~charmers/charms/precise/swift-proxy/trunk at revision 41

charmers: Pending requested 2013-05-29

Diff: 2143 lines (+1290/-485)

20 files modified

.project (+17/-0)
.pydevproject (+8/-0)
config.yaml (+51/-1)
hooks/lib/apache_utils.py (+193/-0)
hooks/lib/cluster_utils.py (+130/-0)
hooks/lib/haproxy_utils.py (+52/-0)
hooks/lib/openstack_common.py (+41/-35)
hooks/lib/utils.py (+332/-0)
hooks/swift-hooks.py (+0/-164)
hooks/swift_hooks.py (+257/-0)
hooks/swift_utils.py (+121/-47)
hooks/utils.py (+0/-237)
metadata.yaml (+6/-0)
revision (+1/-1)
scripts/add_to_cluster (+13/-0)
scripts/remove_from_cluster (+4/-0)
templates/apache2_site.tmpl (+19/-0)
templates/essex/proxy-server.conf (+9/-0)
templates/grizzly/proxy-server.conf (+1/-0)
templates/haproxy.cfg (+35/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

53. By James Page on 2013-05-29

Support upgrades via config-changed

Merged branch lp:~gandelman-a/charms/precise/swift-proxy/upgrade

52. By James Page on 2013-05-20

Rebase against lp:charms/swift-proxy

51. By James Page on 2013-05-01

Fixup delay_auth_decision for essex backward compatibility.

Merged branch lp:~gandelman-a/charms/precise/swift-proxy/essex_fix

50. By Adam Gandelman on 2013-04-26

Merge ahasenack's juju-core compat. patches.

Merged branch lp:~ahasenack/charms/precise/swift-proxy/use-charm-dir

Bug #1172898: Incorrect charm path, does not deploy with go juju

49. By Adam Gandelman on 2013-04-15

Merge Andreas' delay-auth-decision type fix.

Merged branch lp:~ahasenack/charms/precise/swift-proxy/swift-proxy-ha-fix-bool

Bug #1169308: swift-proxy delay-auth-decision has broken default

48. By James Page on 2013-04-11

Add option for delayed auth decision, defaulting to True.

Merged branch lp:~gandelman-a/charms/precise/swift-proxy/delay_auth

47. By Adam Gandelman on 2013-04-10

Ensure memcached restart after port config.

Merged branch lp:~ahasenack/charms/precise/swift-proxy/restart-memcached

Bug #1167540: swift-proxy changes listen port for memcached, but doesn't restart it

46. By Adam Gandelman on 2013-04-09

Sync scripts/.

45. By Adam Gandelman on 2013-04-09

Merge ring files via VIP.

Merged branch lp:~gandelman-a/charms/precise/swift-proxy/ring_files_via_vip

44. By Adam Gandelman on 2013-03-21

Sync utils.py