Merge branch 'master' of ssh://git.zorkdata.com:10022/wanghaiying/transactionlogmask

.gitignore

+# maven ignore
+target
+*.jar
+*.war
+*.zip
+*.tar
+*.tar.gz
+release
+sources
+lib
+plugins
+modules
+
+# eclipse ignore
+*.class
+.settings/
+.project
+.classpath
+
+# idea ignore
+.idea/
+*.ipr
+*.iml
+*.iws
+
+# temp ignore
+*.log
+*.cache
+*.diff
+*.patch
+*.tmp
+logs
+
+# system ignore
+.DS_Store
+Thumbs.db
+**/*.jar
+**/*.class
+.sincedb
+kafka0.10.x/src/docs/*
+# Package Files #
+*.war
+*.ear
+dependency-reduced-pom.xml
+.vertx/
+release
+smartdata-streamx

.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/