You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by milamberspace <gi...@git.apache.org> on 2016/04/22 18:18:51 UTC
[GitHub] cloudstack pull request: L10n update 4.8 20160422
GitHub user milamberspace opened a pull request:
https://github.com/apache/cloudstack/pull/1515
L10n update 4.8 20160422
@swill the good PR for 4.8 branch.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/milamberspace/cloudstack L10N-update-4.8-20160422
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1515.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1515
----
commit 618c49bc63009bda74e209a80e59929c89ba8d63
Author: Milamber <mi...@apache.org>
Date: 2016-04-20T08:13:32Z
Force "translator" mode with the transifex client.
commit d8f3de650da3f45e97bc35408917768f594d0c7c
Author: Milamber <mi...@apache.org>
Date: 2016-04-22T16:14:11Z
Update Transifex client config file for 4.8 resources (generated by Tx client)
commit af70cc761904492429a323fd90edbba59d145223
Author: Milamber <mi...@apache.org>
Date: 2016-04-22T16:16:00Z
Add reference for L18N files for 4.8 resources (generated by Tx client)
commit 819a5b4c85af6f6dc6628d02d1362bd95e7af804
Author: Milamber <mi...@apache.org>
Date: 2016-04-22T16:16:06Z
Update L10N resource files with 4.8 strings from Transifex (20160422)
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-216945403
@swill conflicts fixed. Push with force done, ready to merge.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-216889762
Please rebase this PR to fix the merge conflicts. Thanks... #1527 has been merged into 4.7 and then forward merged to 4.8 and then master. Once the merge conflicts are fixed in this PR, I will merge this one next and then I will check if #1376 has conflicts (which it currently does).
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215226141
Well Jenkins just does not like us today. Can you review the error and see if it is a valid error and try again?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215698702
awesome, thank you sir. i will get this merged today...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-214637123
@swill It's done.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by rhtyd <gi...@git.apache.org>.
Github user rhtyd commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-216229763
LGTM
tag:mergeready
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-214789084
@milamberspace sorry to do this to you again. :( Can you force push again so we can try to get travis green. Thanks...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215671781
@swill after a new push to start a new Travis build, Travis and Jenkins are now green! You can merge the PR! :-)
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215109976
@milamberspace and again. :P sorry...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-214448604
Can you squash the commits for me? I will get this merged and then forward merged to master and then we can rebase the other ones to to make sure we don't have merge conflicts. Thanks...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215645435
@swill Now the Jenkins build works, but the Travis failed with:
No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
...
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by swill <gi...@git.apache.org>.
Github user swill commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215227139
I see another PR with the same error, so I doubt it is your PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-214791549
@swill re-push force done.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by milamberspace <gi...@git.apache.org>.
Github user milamberspace commented on the pull request:
https://github.com/apache/cloudstack/pull/1515#issuecomment-215215852
@swill re-done.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] cloudstack pull request: L10n update 4.8 20160422
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/cloudstack/pull/1515
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---