Merge branch 'rep3' 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/e7d6d945
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e7d6d945
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e7d6d945
Branch: refs/heads/NIFI-250
Commit: e7d6d94584b3f04e709eeaba532f142d11d75b39
Parents: ed5fd73 ac409fd
Author: Brandon DeVries <brandon.devries@gmail.com>
Authored: Mon Mar 30 12:14:20 2015 -0400
Committer: Brandon DeVries <brandon.devries@gmail.com>
Committed: Mon Mar 30 12:14:20 2015 -0400
----------------------------------------------------------------------
.../StandardControllerServiceProvider.java | 6 ++
.../StandardControllerServiceProviderTest.java | 71 ++++++++++++++++++++
.../service/util/TestControllerService.java | 61 +++++++++++++++++
...org.apache.nifi.controller.ControllerService | 15 +++++
4 files changed, 153 insertions(+)
----------------------------------------------------------------------
|