Merge branch 'master' into 0.7-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/ec1ddd90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/ec1ddd90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/ec1ddd90 Branch: refs/heads/0.7-incubating Commit: ec1ddd9020fb18e869fb57402674cbbb6149d0a3 Parents: f242d76 f4ca40e Author: Shwetha GS <[email protected]> Authored: Tue Jun 21 11:11:26 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Jun 21 11:11:26 2016 +0530 ---------------------------------------------------------------------- .../org/apache/atlas/falcon/Util/EventUtil.java | 17 ++- .../atlas/falcon/bridge/FalconBridge.java | 108 +++++++++---------- .../apache/atlas/falcon/event/FalconEvent.java | 9 +- .../apache/atlas/falcon/hook/FalconHook.java | 15 ++- .../falcon/model/FalconDataModelGenerator.java | 46 ++------ .../atlas/falcon/service/AtlasService.java | 6 +- .../apache/atlas/falcon/hook/FalconHookIT.java | 10 ++ .../org/apache/atlas/fs/model/FSDataModel.scala | 5 +- .../atlas/hive/bridge/HiveMetaStoreBridge.java | 27 ++--- .../org/apache/atlas/hive/hook/HiveHook.java | 6 +- .../hive/model/HiveDataModelGenerator.java | 18 +--- .../org/apache/atlas/hive/hook/HiveHookIT.java | 13 ++- .../org/apache/atlas/sqoop/hook/SqoopHook.java | 10 +- .../sqoop/model/SqoopDataModelGenerator.java | 7 +- .../apache/atlas/storm/hook/StormAtlasHook.java | 18 ++-- .../atlas/storm/model/StormDataModel.scala | 19 +--- .../main/java/org/apache/atlas/AtlasClient.java | 11 +- distro/src/conf/atlas-log4j.xml | 2 +- docs/src/site/twiki/InstallationSteps.twiki | 15 +++ release-log.txt | 2 + .../graph/GraphBackedMetadataRepository.java | 18 ++-- .../graph/GraphBackedSearchIndexer.java | 2 +- .../atlas/services/DefaultMetadataService.java | 32 +++--- .../typesystem/types/StructTypeDefinition.java | 9 +- webapp/pom.xml | 30 +++++- .../atlas/web/resources/EntityResource.java | 26 +++-- .../atlas/web/resources/TypesResource.java | 4 +- 27 files changed, 243 insertions(+), 242 deletions(-) ----------------------------------------------------------------------
