Merge lp://staging/~mordred/haildb/update-pandora into lp://staging/haildb
Proposed by
Monty Taylor
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 69 | ||||
| Proposed branch: | lp://staging/~mordred/haildb/update-pandora | ||||
| Merge into: | lp://staging/haildb | ||||
| Diff against target: |
1173 lines (+583/-119) 22 files modified
.quickly (+1/-1) config/lcov.am (+42/-0) config/pandora-plugin (+56/-11) configure.ac (+1/-4) m4/pandora_bison.m4 (+33/-0) m4/pandora_canonical.m4 (+94/-6) m4/pandora_check_cxx_standard.m4 (+1/-1) m4/pandora_drizzle_build.m4 (+6/-4) m4/pandora_flex.m4 (+33/-0) m4/pandora_have_boost.m4 (+22/-1) m4/pandora_have_libboost_filesystem.m4 (+2/-2) m4/pandora_have_libboost_iostreams.m4 (+49/-0) m4/pandora_have_libboost_regex.m4 (+54/-0) m4/pandora_have_libgtest.m4 (+3/-0) m4/pandora_have_libhaildb.m4 (+43/-0) m4/pandora_have_protobuf.m4 (+3/-1) m4/pandora_intltool.m4 (+1/-1) m4/pandora_optimize.m4 (+4/-4) m4/pandora_plugins.m4 (+5/-0) m4/pandora_vc_build.m4 (+3/-0) m4/pandora_visibility.m4 (+1/-2) m4/pandora_warnings.m4 (+126/-81) |
||||
| To merge this branch: | bzr merge lp://staging/~mordred/haildb/update-pandora | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stewart Smith | Approve | ||
|
Review via email:
|
|||
Description of the change
Updated pandora to latest. Oh, also fixed that bug.
To post a comment you must log in.
Revision history for this message
| Monty Taylor (mordred) wrote | # |
Revision history for this message
| Stewart Smith (stewart) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
<stewart> mtaylor, weird reformatting of Changelog
mtaylor, what if i just bzr revert the changes there?
mtaylor, as it's kinda useful having that changelog to compare with the one in mysql when merging...
mtaylor, and when i reconfigure it changes Changelog a lot.