Merge lp:~bregma/unity/lp-1486498 into lp:unity
Proposed by
Stephen M. Webb
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4030 |
Proposed branch: | lp:~bregma/unity/lp-1486498 |
Merge into: | lp:unity |
Diff against target: |
30 lines (+3/-4) 1 file modified
tools/unity.cmake (+3/-4) |
To merge this branch: | bzr merge lp:~bregma/unity/lp-1486498 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Brandon Schaefer (community) | Approve | ||
Review via email: mp+268504@code.launchpad.net |
Commit message
changed the wording of the help message and warning message for the --reset option
Description of the change
Changed the wording of the help message and warning message for the --reset option. Also made the --reset option act as deprecated, so it goes ahead and performs the reset regardless.
To post a comment you must log in.
FAILED: Continuous integration, rev:3989 jenkins. qa.ubuntu. com/job/ unity-ci/ 1287/ jenkins. qa.ubuntu. com/job/ unity-wily- amd64-ci/ 65 jenkins. qa.ubuntu. com/job/ unity-wily- armhf-ci/ 63 jenkins. qa.ubuntu. com/job/ unity-wily- i386-ci/ 63/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1287/ rebuild
http://