diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-21 13:49:08 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-21 13:49:08 +0000 |
| commit | 6bcbf03b5aa4448832645a29ec2bc4b2fc5f2eaf (patch) | |
| tree | 750f73a40aa62c20d66a2532fef6fd158cebb9c4 /cli/src | |
| parent | 0225d7bc712609232d592d48116ec771cd97c2cf (diff) | |
| parent | 17c4fb2d04f84b5632983866e8bddfbd7d77a054 (diff) | |
Merge branch 'upstream'
Conflicts:
api/src/glfs-fops.c
api/src/glfs-handleops.c
Change-Id: I6811674cc4ec4be6fa6e4cdebb4bc428194bebd8
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/cli-xml-output.c | 10 | ||||
| -rw-r--r-- | cli/src/input.c | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c index 69fed1bc9..886c372dc 100644 --- a/cli/src/cli-xml-output.c +++ b/cli/src/cli-xml-output.c @@ -2715,6 +2715,16 @@ cli_xml_output_vol_info (cli_local_t *local, dict_t *dict) (local->writer, "%s", brick); XML_RET_CHECK_AND_GOTO (ret, out); + ret = xmlTextWriterWriteFormatElement + (local->writer, (xmlChar *)"name", "%s", + brick); + XML_RET_CHECK_AND_GOTO (ret, out); + + ret = xmlTextWriterWriteFormatElement + (local->writer, (xmlChar *)"hostUuid", "%s", + uuid); + XML_RET_CHECK_AND_GOTO (ret, out); + /* </brick> */ ret = xmlTextWriterEndElement (local->writer); XML_RET_CHECK_AND_GOTO (ret, out); diff --git a/cli/src/input.c b/cli/src/input.c index a8ea46c6d..26f337c3c 100644 --- a/cli/src/input.c +++ b/cli/src/input.c @@ -87,7 +87,7 @@ cli_input_init (struct cli_state *state) cli_rl_enable (state); } else { state->prompt = ""; - state->mode = GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; + state->mode |= GLUSTER_MODE_SCRIPT | GLUSTER_MODE_ERR_FATAL; } if (!state->rl_enabled) |