Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[ZEPPELIN-2622] Minor adjustments

Browse source
This commit is contained in:
Nelson Costa 2017-06-11 13:18:27 +01:00
parent 2d204555be
commit 426b1eac7d
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
docs/rest-api/rest-zeppelin-server.md
View file

@ -49,12 +49,11 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<td>200</td>
</tr>
<tr>
<td> Fail code</td>
<td> 500 </td>
<td>Fail code</td>
<td>500</td>
</tr>
<tr>
<td> sample JSON response
</td>
<td>sample JSON response</td>
<td>
<pre>
{
@ -62,12 +61,12 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
"message": "Zeppelin version",
"body": [
{
"version": "0.8.0-SNAPSHOT",
"commitId": "abc0123",
"timestamp": "2017-01-02 03:04:05"
"version": "0.8.0",
"git-commit-id": "abc0123",
"git-timestamp": "2017-01-02 03:04:05"
}
]
}
}
</pre>
</td>
</tr>
@ -89,29 +88,27 @@ If you work with Apache Zeppelin and find a need for an additional REST API, ple
<td>200</td>
</tr>
<tr>
<td> Fail code</td>
<td> 406 </td>
<td>Fail code</td>
<td>406</td>
</tr>
<tr>
<td> sample JSON response
</td>
<td>sample JSON response</td>
<td>
<pre>
{
"status": "OK"
}
}
</pre>
</td>
</tr>
<tr>
<td> sample error JSON response
</td>
<td>sample error JSON response</td>
<td>
<pre>
{
"status":"NOT_ACCEPTABLE",
"message":"Please check LOG level specified. Valid values: DEBUG, ERROR, FATAL, INFO, TRACE, WARN"
}
}
</pre>
</td>
</tr>

4
zeppelin-server/src/main/java/org/apache/zeppelin/rest/ZeppelinRestApi.java
View file

@ -61,8 +61,8 @@ public class ZeppelinRestApi {
public Response getVersion() {
Map<String, String> versionInfo = new HashMap<>();
versionInfo.put("version", Util.getVersion());
versionInfo.put("commitId", Util.getGitCommitId());
versionInfo.put("timestamp", Util.getGitTimestamp());
versionInfo.put("git-commit-id", Util.getGitCommitId());
versionInfo.put("git-timestamp", Util.getGitTimestamp());
return new JsonResponse<>(Response.Status.OK, "Zeppelin version", versionInfo).build();
}