You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2015/04/22 23:13:11 UTC
[21/49] incubator-nifi git commit: Merge branch 'develop' into
NIFI-271
Merge branch 'develop' into NIFI-271
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6d728406
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6d728406
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6d728406
Branch: refs/heads/develop
Commit: 6d728406de755ce2d9d655890aa2012895382b59
Parents: bcb3ca8 bef65db
Author: joewitt <jo...@apache.org>
Authored: Tue Apr 21 14:03:22 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Tue Apr 21 14:03:22 2015 -0400
----------------------------------------------------------------------
.../images/add-controller-service-window.png | Bin 155417 -> 157241 bytes
.../images/controller-services-edit-buttons.png | Bin 5049 -> 22294 bytes
.../controller-services-edit-buttons2.png | Bin 0 -> 21845 bytes
.../asciidoc/images/controller-services-tab.png | Bin 166310 -> 167278 bytes
.../images/reporting-tasks-edit-buttons2.png | Bin 0 -> 17525 bytes
.../asciidoc/images/reporting-tasks-tab.png | Bin 158876 -> 161551 bytes
.../asciidoc/images/settings-general-tab.png | Bin 129148 -> 132657 bytes
.../nifi-docs/src/main/asciidoc/user-guide.adoc | 12 +++++++-----
8 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------