Merge branch 'develop' into NIFI-735
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/93546760 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/93546760 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/93546760 Branch: refs/heads/develop Commit: 93546760be2223f40215a0aeb9614dbb9bdb148f Parents: bd9782c 4dc2ea6 Author: danbress <dbr...@onyxconsults.com> Authored: Sun Jun 28 16:03:32 2015 -0400 Committer: danbress <dbr...@onyxconsults.com> Committed: Sun Jun 28 16:03:32 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-docs/src/main/asciidoc/developer-guide.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------