Merge branch 'NIFI-292' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-292
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5f2bd4fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5f2bd4fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5f2bd4fb Branch: refs/heads/NIFI-292 Commit: 5f2bd4fb9702ab4668a74e63c9c55a1edab7c268 Parents: 9bdc752 ead451f Author: Matt Gilman <[email protected]> Authored: Tue Apr 28 09:57:08 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Apr 28 09:57:08 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/web/api/BulletinBoardResource.java | 1 + .../src/main/java/org/apache/nifi/web/api/ClusterResource.java | 1 + .../src/main/java/org/apache/nifi/web/api/ConnectionResource.java | 1 + .../src/main/java/org/apache/nifi/web/api/ControllerResource.java | 1 + 4 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2bd4fb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/BulletinBoardResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2bd4fb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ClusterResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2bd4fb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/5f2bd4fb/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerResource.java ----------------------------------------------------------------------
