Merge lp:~robru/unity-scopes-api/vivid-tweaks into lp:unity-scopes-api/devel
| Status: | Merged |
|---|---|
| Merge reported by: | Robert Bruce Park |
| Merged at revision: | not available |
| Proposed branch: | lp:~robru/unity-scopes-api/vivid-tweaks |
| Merge into: | lp:unity-scopes-api/devel |
| Diff against target: |
413 lines (+90/-180) 13 files modified
CMakeLists.txt (+17/-24) HACKING (+15/-10) debian/QT-VERSION (+0/-1) debian/QT-VERSION.MAJOR (+1/-0) debian/QT-VERSION.MICRO (+1/-0) debian/QT-VERSION.MINOR (+1/-0) debian/VERSION (+0/-1) debian/VERSION.MAJOR (+1/-0) debian/VERSION.MICRO (+1/-0) debian/VERSION.MINOR (+1/-0) debian/bileto_pre_release_hook (+51/-61) debian/get-versions.sh (+0/-82) debian/rules (+1/-1) |
| To merge this branch: | bzr merge lp:~robru/unity-scopes-api/vivid-tweaks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michi Henning (community) | 2016-03-13 | Approve on 2016-03-13 | |
| PS Jenkins bot | continuous-integration | Approve on 2016-03-13 | |
| Robert Bruce Park (community) | Needs Fixing on 2016-03-13 | ||
|
Review via email:
|
|||
Commit Message
Simplify debian/control munging.
Description of the Change
Simplify debian/control munging.
- 376. By Robert Bruce Park on 2016-03-13
-
Update HACKING.
| Robert Bruce Park (robru) wrote : | # |
Oh shit:
+ [ Pawel Stolowski ]
+ * New RangeInputFilter.
+
+ [ Michi Henning ]
+ * Changed ABI compliance testing to use abigail.
That means those are commits that were on trunk that aren't in the devel branch, that are part of this merge because I just merged devel rather than starting over on devel.
I'll fix this later...
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:375
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
| PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:376
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://

Build looks good on my end here:
https:/ /requests. ci-train. staging. ubuntu. com/log/ 16/build/ 22
But the diffs went a bit crazy:
https:/ /objectstorage. prodstack4- 5.canonical. com/v1/ AUTH_363fe1b4bf e34b0295bc243be 24dfbf1/ bileto- 16/2016- 03-13_03: 47:55/xenial_ unity-scopes- api_content. diff /objectstorage. prodstack4- 5.canonical. com/v1/ AUTH_363fe1b4bf e34b0295bc243be 24dfbf1/ bileto- 16/2016- 03-13_03: 47:55/vivid_ unity-scopes- api_content. diff
https:/
I guess you have a lot of unreleased changes in the devel branch? Please take a look at the diffs and confirm that this branch is producing expected results, thanks.
This branch also should work with the existing train, so please do include this in your next silo (but there's no need to make a silo just for this merge)