Mark Payne 8ebf1f03c2 Merge branch 'nifi-868' of https://github.com/pukkaone/nifi into NIFI-868		2015-08-19 12:56:26 -04:00
..
asciidoc	Merge branch 'nifi-868' of https://github.com/pukkaone/nifi into NIFI-868	2015-08-19 12:56:26 -04:00
assembly	NIFI-850 removed nifi parent, updated nifi pom, moved all nifi subdirs up one level, fixed readme.	2015-08-15 13:12:22 -04:00