Merge lp://qastaging/~mordred/haildb/update-pandora into lp://qastaging/haildb
Proposed by
Patrick Crews
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 41 | ||||
| Proposed branch: | lp://qastaging/~mordred/haildb/update-pandora | ||||
| Merge into: | lp://qastaging/haildb | ||||
| Diff against target: |
1183 lines (+569/-133) 20 files modified
.quickly (+1/-1) Makefile.am (+2/-1) api/api0ucode.c (+3/-3) config/pandora-plugin (+8/-1) m4/iconv.m4 (+51/-17) m4/pandora_canonical.m4 (+78/-10) m4/pandora_drizzle_build.m4 (+4/-41) m4/pandora_enable_dtrace.m4 (+3/-1) m4/pandora_have_libboost_date_time.m4 (+46/-0) m4/pandora_have_libboost_filesystem.m4 (+45/-0) m4/pandora_have_libinnodb.m4 (+25/-29) m4/pandora_intltool.m4 (+225/-0) m4/pandora_optimize.m4 (+0/-4) m4/pandora_platform.m4 (+11/-1) m4/pandora_visibility.m4 (+10/-1) m4/pandora_warnings.m4 (+41/-7) m4/po.m4 (+5/-5) m4/progtest.m4 (+7/-7) ut/ut0mem.c (+2/-2) ut/ut0ut.c (+2/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mordred/haildb/update-pandora | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stewart Smith | Pending | ||
|
Review via email:
|
|||
Description of the change
Fixes make distcheck
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
