Merge lp://staging/~paulgear/charms/trusty/cassandra/devel into lp://staging/charms/trusty/cassandra

Proposed by Paul Gear
Status: Merged
Merged at revision: 379
Proposed branch: lp://staging/~paulgear/charms/trusty/cassandra/devel
Merge into: lp://staging/charms/trusty/cassandra
Diff against target: 56 lines (+14/-4)
3 files modified
hooks/actions.py (+2/-4)
hooks/helpers.py (+2/-0)
hooks/hooks.py (+10/-0)
To merge this branch: bzr merge lp://staging/~paulgear/charms/trusty/cassandra/devel
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
charmers Pending
Review via email: mp+298856@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Gear (paulgear) wrote :

Currently testing; please do not merge yet. This is merely here to easily share diffs against trunk.

385. By Paul Gear

Revert old version checks and let's just pretend DSE 5.0 == Cassandra 3.0

386. By Paul Gear

Remove debug logging now that DSE 5.0 == Cassandra 3.0 is confirmed

Revision history for this message
Paul Gear (paulgear) wrote :

This is passing in is-mojo-ci now. Tagging Stuart for review.

Revision history for this message
Paul Gear (paulgear) wrote :

To clarify the purpose of this branch, it's to fix the handling of DSE 5.0, and to make it possible to install everything via proxy in an egress-filtered environment (i.e. our CI).

Revision history for this message
Stuart Bishop (stub) wrote :

All good, bar a single pedantic point I don't really care about.

review: Approve

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

to all changes: