Return-Path: X-Original-To: apmail-nifi-commits-archive@minotaur.apache.org Delivered-To: apmail-nifi-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DA0DB1741C for ; Wed, 4 Mar 2015 14:30:53 +0000 (UTC) Received: (qmail 73764 invoked by uid 500); 4 Mar 2015 14:30:19 -0000 Delivered-To: apmail-nifi-commits-archive@nifi.apache.org Received: (qmail 73713 invoked by uid 500); 4 Mar 2015 14:30:19 -0000 Mailing-List: contact commits-help@nifi.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.incubator.apache.org Delivered-To: mailing list commits@nifi.incubator.apache.org Received: (qmail 73701 invoked by uid 99); 4 Mar 2015 14:30:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 14:30:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Mar 2015 14:29:57 +0000 Received: (qmail 71177 invoked by uid 99); 4 Mar 2015 14:29:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 14:29:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64E2BE107B; Wed, 4 Mar 2015 14:29:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mcgilman@apache.org To: commits@nifi.incubator.apache.org Date: Wed, 04 Mar 2015 14:30:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/50] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/50744bfd Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/50744bfd Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/50744bfd Branch: refs/heads/NIFI-376 Commit: 50744bfdc608c2395b7af281a587d241356e699c Parents: 97aa53d 4ac6dfd Author: Mark Payne Authored: Wed Feb 25 14:35:45 2015 -0500 Committer: Mark Payne Committed: Wed Feb 25 14:35:45 2015 -0500 ---------------------------------------------------------------------- .../src/main/asciidoc/administration-guide.adoc | 43 ++++++++++++++------ nifi/nifi-docs/src/main/asciidoc/overview.adoc | 4 +- .../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 +++++ 3 files changed, 44 insertions(+), 14 deletions(-) ----------------------------------------------------------------------