Skip to content

Commit

Permalink
Merge branch 'master' into cli_user_can_provide_tags
Browse files Browse the repository at this point in the history 
Conflicts:
	cf/i18n/resources/de_DE.all.json
	cf/i18n/resources/en_US.all.json
	cf/i18n/resources/es_ES.all.json
	cf/i18n/resources/fr_FR.all.json
	cf/i18n/resources/it_IT.all.json
	cf/i18n/resources/ja_JA.all.json
	cf/i18n/resources/pt_BR.all.json
	cf/i18n/resources/zh_Hans.all.json
	cf/i18n/resources/zh_Hant.all.json
  • Loading branch information
@rainmaker
rainmaker committed Jun 8, 2015
2 parents 42fd356 + 10cd701 commit 86d57e0
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions cf/commands/service/update_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ func (cmd *UpdateService) Metadata() command_metadata.CommandMetadata {
Usage: T(`CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]
Optionally provide service-specific configuration parameters in a valid JSON object in-line.
cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{"name":"value","name":"value"}'
cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{"name":"value","name":"value"}'
Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.
cf create-service SERVICE_INSTANCE -c PATH_TO_FILE
cf update-service SERVICE_INSTANCE -c PATH_TO_FILE
Example of valid JSON object:
{
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/de_DE.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/en_US.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,8 +1140,8 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
},
{
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/es_ES.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/fr_FR.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/it_IT.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/ja_JA.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
4 changes: 2 additions & 2 deletions cf/i18n/resources/pt_BR.all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,9 +1140,9 @@
"modified": false
},
{
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"id": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf update-service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf update-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"translation": "CF_NAME update-service SERVICE_INSTANCE [-p NEW_PLAN] [-c PARAMETERS_AS_JSON]\n\n Optionally provide service-specific configuration parameters in a valid JSON object in-line.\n cf create--service SERVICE PLAN SERVICE_INSTANCE -c '{\"name\":\"value\",\"name\":\"value\"}'\n\n Optionally provide a file containing service-specific configuration parameters in a valid JSON object. The path to the parameters file can be an absolute or relative path to a file.\n cf create-service SERVICE_INSTANCE -c PATH_TO_FILE\n\n Example of valid JSON object:\n {\n \"cluster_nodes\": {\n \"count\": 5,\n \"memory_mb\": 1024\n }\n }\n\nEXAMPLE:\n cf update-service mydb -p gold\n cf update-service mydb -c '{\"ram_gb\":4}'\n cf update-service mydb -c ~/workspace/tmp/instance_config.json",
"modified": false
"modified": true
},
{
"id": "CF_NAME update-service-auth-token LABEL PROVIDER TOKEN",
Expand Down
Loading

0 comments on commit 86d57e0

Please sign in to comment.