You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@brooklyn.apache.org by aledsage <gi...@git.apache.org> on 2014/11/04 01:41:05 UTC
[GitHub] incubator-brooklyn pull request: Fix various 20141103
GitHub user aledsage opened a pull request:
https://github.com/apache/incubator-brooklyn/pull/293
Fix various 20141103
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/incubator-brooklyn fix/various-20141103
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/293.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 #293
----
commit 7a2c54e46a29cd0c4b535b69da49bcebc6fec83d
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:53:09Z
Fix ApplicationResourceIntegrationTest
- Accept stopped or “stopped”.
- Not sure if entirely necessary, but suspect might be based on
behaviour seen on jenkins for some other tests!
commit b586bcc925d704b178a011d78e0293688e7b108b
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:53:48Z
MongoDB deployment integration test: fix assert
commit 62b3ff7b2acf314a45b8c9994998ec9e5675e7db
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:54:06Z
MongoDB deployment: fix infinite loop
commit 2995857ba93c244035157fc3f7fbb5d48107657f
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-04T00:08:23Z
MongoDB: fix race in adding shards
- if adding the shard fails, then try again
commit 9a12f25bc93ee0f8c583d433d1f03dadd2ca447f
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-04T00:39:58Z
Fix Riak install on Ubuntu
----
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by grkvlt <gi...@git.apache.org>.
Github user grkvlt commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/293#issuecomment-61741334
@aledsage OK, Riak integration tests passing for me on an Ubuntu VM, happy for merge :frog:
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by aledsage <gi...@git.apache.org>.
GitHub user aledsage reopened a pull request:
https://github.com/apache/incubator-brooklyn/pull/293
Fix various 20141103
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/aledsage/incubator-brooklyn fix/various-20141103
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-brooklyn/pull/293.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 #293
----
commit 7a2c54e46a29cd0c4b535b69da49bcebc6fec83d
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:53:09Z
Fix ApplicationResourceIntegrationTest
- Accept stopped or “stopped”.
- Not sure if entirely necessary, but suspect might be based on
behaviour seen on jenkins for some other tests!
commit b586bcc925d704b178a011d78e0293688e7b108b
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:53:48Z
MongoDB deployment integration test: fix assert
commit 62b3ff7b2acf314a45b8c9994998ec9e5675e7db
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-03T23:54:06Z
MongoDB deployment: fix infinite loop
commit 2995857ba93c244035157fc3f7fbb5d48107657f
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-04T00:08:23Z
MongoDB: fix race in adding shards
- if adding the shard fails, then try again
commit 9a12f25bc93ee0f8c583d433d1f03dadd2ca447f
Author: Aled Sage <al...@gmail.com>
Date: 2014-11-04T00:39:58Z
Fix Riak install on Ubuntu
----
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by grkvlt <gi...@git.apache.org>.
Github user grkvlt commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/293#issuecomment-61704691
@aledsage This looks OK, but would like to test Riak before 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] incubator-brooklyn pull request: Fix various 20141103
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/293#issuecomment-61630823
Build failure looks unrelated - a test with an assertion of true within 1 second failed.
I'll increase that timeout (i.e. get rid of the code that changes the default) in a separate PR.
Closing and re-opening to kick of jenkins 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] incubator-brooklyn pull request: Fix various 20141103
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage commented on the pull request:
https://github.com/apache/incubator-brooklyn/pull/293#issuecomment-61741386
Thanks @grkvlt - merging.
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by grkvlt <gi...@git.apache.org>.
Github user grkvlt commented on a diff in the pull request:
https://github.com/apache/incubator-brooklyn/pull/293#discussion_r19784270
--- Diff: software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNodeSshDriver.java ---
@@ -120,18 +118,28 @@ public void install() {
String saveAsYum = "riak.rpm";
String saveAsApt = "riak.deb";
OsDetails osDetails = getMachine().getOsDetails();
+
+ String downloadUrl;
+ String osReleaseCmd;
+ if ("debian".equalsIgnoreCase(osDetails.getName())) {
+ // TODO osDetails.getName() is returning "linux", instead of debian/ubuntu on OS X with jenkins image
--- End diff --
OS X?
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by aledsage <gi...@git.apache.org>.
Github user aledsage closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/293
---
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] incubator-brooklyn pull request: Fix various 20141103
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-brooklyn/pull/293
---
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.
---