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/4d60dac5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4d60dac5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4d60dac5 Branch: refs/heads/0.7-incubating Commit: 4d60dac5f89182fd40dca7157b5e7ded469d346d Parents: ec1ddd9 7b3ace5 Author: Shwetha GS <[email protected]> Authored: Tue Jun 21 14:23:02 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Tue Jun 21 14:23:02 2016 +0530 ---------------------------------------------------------------------- addons/falcon-bridge/pom.xml | 18 ++++ addons/hdfs-model/pom.xml | 16 ++- addons/hive-bridge/pom.xml | 18 ++++ addons/sqoop-bridge/pom.xml | 18 ++++ addons/storm-bridge/pom.xml | 20 +++- catalog/pom.xml | 8 ++ client/pom.xml | 8 ++ .../org/apache/atlas/ApplicationProperties.java | 18 +++- notification/pom.xml | 8 ++ pom.xml | 4 + release-log.txt | 1 + repository/pom.xml | 8 ++ typesystem/pom.xml | 12 +++ .../main/resources/atlas-application.properties | 107 ------------------- .../test/resources/atlas-application.properties | 92 +++++++++++++++- webapp/pom.xml | 12 +++ 16 files changed, 256 insertions(+), 112 deletions(-) ----------------------------------------------------------------------
