Merge lp://qastaging/~linuxjedi/libdrizzle/libdrizzle-redux-5-ssl-option into lp://qastaging/libdrizzle/5.0
Proposed by
Andrew Hutchings
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 45 | ||||
| Proposed branch: | lp://qastaging/~linuxjedi/libdrizzle/libdrizzle-redux-5-ssl-option | ||||
| Merge into: | lp://qastaging/libdrizzle/5.0 | ||||
| Diff against target: |
256 lines (+44/-14) 9 files modified
CMakeLists.txt (+8/-3) cli/libdrizzle_config.c (+8/-0) config.h.in (+1/-0) libdrizzle/conn.c (+6/-3) libdrizzle/drizzle.c (+4/-1) libdrizzle/drizzle.h (+2/-2) libdrizzle/drizzle_client.h (+2/-0) libdrizzle/handshake.c (+6/-4) libdrizzle/structs.h (+7/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~linuxjedi/libdrizzle/libdrizzle-redux-5-ssl-option | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew Hutchings | Pending | ||
|
Review via email:
|
|||
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
