You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/02/09 15:57:21 UTC
[2/3] incubator-brooklyn git commit: Typos and extra comments
Typos and extra comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c0c935e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c0c935e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c0c935e3
Branch: refs/heads/master
Commit: c0c935e31f76f2b1095795174af49af6760c3a69
Parents: 30aad62
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Fri Feb 6 15:55:19 2015 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Fri Feb 6 15:55:19 2015 +0000
----------------------------------------------------------------------
core/src/main/java/brooklyn/config/render/RendererHints.java | 5 ++++-
core/src/main/java/brooklyn/util/task/DynamicTasks.java | 2 +-
.../brooklyn/entity/software/MachineLifecycleEffectorTasks.java | 3 +--
.../brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java | 4 ++--
usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c0c935e3/core/src/main/java/brooklyn/config/render/RendererHints.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/render/RendererHints.java b/core/src/main/java/brooklyn/config/render/RendererHints.java
index 8bea13c..247b4f4 100644
--- a/core/src/main/java/brooklyn/config/render/RendererHints.java
+++ b/core/src/main/java/brooklyn/config/render/RendererHints.java
@@ -268,7 +268,10 @@ public class RendererHints {
return new NamedActionWithUrl<T>("Open", transform);
}
- /** use with care as this makes REST access difficult */
+ /**
+ * Forces the given sensor or config key's value to be censored. It will be
+ * presented as <code>********</code>.
+ */
@Beta
public static <T> DisplayValue<T> censoredValue() {
return new DisplayValue<T>(Functions.constant("********"));
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c0c935e3/core/src/main/java/brooklyn/util/task/DynamicTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/task/DynamicTasks.java b/core/src/main/java/brooklyn/util/task/DynamicTasks.java
index bb87676..0ef29c4 100644
--- a/core/src/main/java/brooklyn/util/task/DynamicTasks.java
+++ b/core/src/main/java/brooklyn/util/task/DynamicTasks.java
@@ -307,7 +307,7 @@ public class DynamicTasks {
return q.isEmpty() ? null : Iterables.getLast(q);
}
- /** Calls {@link TaskQueueingContext#drain(Duration, boolean)} on the current task context */
+ /** Calls {@link TaskQueueingContext#drain(Duration, boolean, boolean)} on the current task context */
public static TaskQueueingContext drain(Duration optionalTimeout, boolean throwFirstError) {
TaskQueueingContext qc = DynamicTasks.getTaskQueuingContext();
Preconditions.checkNotNull(qc, "Cannot drain when there is no queueing context");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c0c935e3/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
index 5288951..378e662 100644
--- a/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
+++ b/software/base/src/main/java/brooklyn/entity/software/MachineLifecycleEffectorTasks.java
@@ -78,7 +78,6 @@ import brooklyn.util.text.Strings;
import brooklyn.util.time.Duration;
import com.google.common.annotations.Beta;
-import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@@ -603,7 +602,7 @@ public abstract class MachineLifecycleEffectorTasks {
if (stoppingProcess == null) {
msg.append(". Process stop skipped, pre-stop not finished?");
} else {
- msg.append(" because process stop has "+
+ msg.append(" because process stop has ").append(
(stoppingProcess.isDone() ? "finished abnormally" : "not finished"));
}
log.warn(msg.toString());
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c0c935e3/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
index aa417fe..8210c77 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/mongodb/AbstractMongoDBSshDriver.java
@@ -103,8 +103,8 @@ public abstract class AbstractMongoDBSshDriver extends AbstractSoftwareProcessSs
// We could also use SIGTERM (15)
new ScriptHelper(this, "Send SIGINT to MongoDB server")
- .body.append("kill -2 $(cat " + getPidFile() + ")")
- .execute();
+ .body.append("kill -2 $(cat " + getPidFile() + ")")
+ .execute();
}
protected String getBaseName() {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c0c935e3/usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java
----------------------------------------------------------------------
diff --git a/usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java b/usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java
index becba88..5794dba 100644
--- a/usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java
+++ b/usage/rest-api/src/main/java/brooklyn/rest/api/AccessApi.java
@@ -42,7 +42,7 @@ import com.wordnik.swagger.core.ApiParam;
public interface AccessApi {
// TODO First access use-case is to disable location-provisioning (for Citrix's Cloud Portal Business Manager (CPBM)).
- // We rely on location implementations calling m`anagementContext.getAccessController().canProvisionLocation(parent)`,
+ // We rely on location implementations calling `managementContext.getAccessController().canProvisionLocation(parent)`,
// which isn't ideal (because some impls might forget to do this). We can't just do it in the core management-context
// because things like JcloudsLocation will provision the VM and only then create the JcloudsSshMachineLocation.