Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  BaseCommand: Fix formatting of task description with arguments
  Add analytics to the list of plugins

Change-Id: I8b6e5f77c2c6778200a8c4ae7d7c836873634dc0
This commit is contained in:
David Pursehouse 2018-03-02 11:31:45 +09:00
commit c5f25924b0
2 changed files with 14 additions and 3 deletions

View File

@ -163,6 +163,18 @@ Project] |
link:https://gerrit.googlesource.com/plugins/admin-console/+doc/master/src/main/resources/Documentation/about.md[
Documentation]
[[analytics]]
=== analytics
Plugin to extract commit and review data from Gerrit projects and
expose aggregated metrics over REST and SSH API.
Metrics are extracted in JSON format with one record per line, ready to be
archived and processed with popular BigData transformation tools such
Apache Spark or published and visualized in dashboards.
link:https://gerrit-review.googlesource.com/#/admin/projects/plugins/analytics[Project] |
link:https://gerrit.googlesource.com/plugins/analytics/+doc/master/README.md[Documentation]
[[avatars-external]]
=== avatars-external

View File

@ -394,12 +394,11 @@ public abstract class BaseCommand implements Command {
}
protected String getTaskDescription() {
StringBuilder m = new StringBuilder(commandName);
String[] ta = getTrimmedArguments();
if (ta != null) {
m.append(Joiner.on(" ").join(ta));
return commandName + " " + Joiner.on(" ").join(ta);
}
return m.toString();
return commandName;
}
private String getTaskName() {