Merge lp://staging/~unity-api-team/unity-scope-snappy/add_gettext_to_vendors into lp://staging/~unity-api-team/unity-scope-snappy/trunk
Proposed by
Antti Kaijanmäki
Status: | Needs review |
---|---|
Proposed branch: | lp://staging/~unity-api-team/unity-scope-snappy/add_gettext_to_vendors |
Merge into: | lp://staging/~unity-api-team/unity-scope-snappy/trunk |
Diff against target: |
579 lines (+473/-10) 6 files modified
debian/copyright (+4/-0) internal/github.com/gosexy/gettext/LICENSE (+20/-0) internal/github.com/gosexy/gettext/README.md (+94/-0) internal/github.com/gosexy/gettext/gettext.go (+207/-0) internal/github.com/gosexy/gettext/gettext_test.go (+130/-0) internal/vendor.json (+18/-10) |
To merge this branch: | bzr merge lp://staging/~unity-api-team/unity-scope-snappy/add_gettext_to_vendors |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kyle Fazzari (community) | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+269290@code.staging.launchpad.net |
Commit message
Add github.
Description of the change
-
To post a comment you must log in.
Unmerged revisions
- 36. By Antti Kaijanmäki
-
update debian/copyright
- 35. By Antti Kaijanmäki
-
merge trunk, resolve conflict in internal/
vendor. json - 34. By Antti Kaijanmäki
-
Add github.
com/gosexy/ gettext to vendors.
FAILED: Continuous integration, rev:34 jenkins. qa.ubuntu. com/job/ unity-scope- snappy- ci/143/ jenkins. qa.ubuntu. com/job/ unity-scope- snappy- wily-amd64- ci/100/ console jenkins. qa.ubuntu. com/job/ unity-scope- snappy- wily-armhf- ci/97/console jenkins. qa.ubuntu. com/job/ unity-scope- snappy- wily-i386- ci/97/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-snappy- ci/143/ rebuild
http://