Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/providers/openflow/flow/.checkstyle b/providers/openflow/flow/.checkstyle
deleted file mode 100644
index 68c7cd3..0000000
--- a/providers/openflow/flow/.checkstyle
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="maven-checkstyle-plugin validate-checkstyle" location="jar:file:/Users/ash/.m2/repository/org/onlab/tools/onos-build-conf/1.0/onos-build-conf-1.0.jar!/onos/checkstyle.xml" type="remote" description="maven-checkstyle-plugin configuration validate-checkstyle">
- <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
- <property name="checkstyle.suppressions.file" value="/Users/ash/work/onos-next/providers/of/host/target/checkstyle-suppressions-validate-checkstyle.xml"/>
- <property name="checkstyle.header.file" value="/Users/ash/work/onos-next/providers/of/host/target/checkstyle-header-validate-checkstyle.txt"/>
- </local-check-config>
- <fileset name="java-sources-validate-checkstyle" enabled="true" check-config-name="maven-checkstyle-plugin validate-checkstyle" local="true">
- <file-match-pattern match-pattern="src/test/java.*\.java" include-pattern="true"/>
- <file-match-pattern match-pattern="src/main/java/.*\.java" include-pattern="true"/>
- <file-match-pattern match-pattern="src/main/resources.*\.properties" include-pattern="true"/>
- <file-match-pattern match-pattern="src/test/resources.*\.properties" include-pattern="true"/>
- </fileset>
-</fileset-config>