Merge branch 'apache-local' into dal
Conflicts:
repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java
Showing
addons/falcon-bridge/pom.xml
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v1/Search.html
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v1/css/bootstrap-theme.css
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v1/css/bootstrap.css
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v1/css/bootstrap.css.map
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v1/css/bootstrap.min.css
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v1/css/heroic-features.css
deleted
100755 → 0
dashboard/v1/css/style.css
deleted
100755 → 0
File deleted
This diff is collapsed.
Click to expand it.
File deleted
File deleted
File deleted
dashboard/v1/img/HWLOGO-g.png
deleted
100755 → 0
7.1 KB
dashboard/v1/img/HWLOGO.png
deleted
100755 → 0
6.6 KB
dashboard/v1/img/aetna-logo.png
deleted
100755 → 0
5.18 KB
dashboard/v1/img/elephant.png
deleted
100755 → 0
180 KB
8.57 KB
12.5 KB
dashboard/v1/img/graph1.1.jpg
deleted
100755 → 0
37.6 KB
dashboard/v1/img/graph1.jpg
deleted
100755 → 0
15.6 KB
dashboard/v1/img/hwlogo1.png
deleted
100755 → 0
9.05 KB
dashboard/v1/img/img-1.jpg
deleted
100755 → 0
370 KB
dashboard/v1/img/img-2.jpg
deleted
100755 → 0
141 KB
dashboard/v1/img/logo-1.png
deleted
100755 → 0
4.66 KB
dashboard/v1/img/logo-sm.png
deleted
100755 → 0
2.11 KB
dashboard/v1/img/mid-img.png
deleted
100755 → 0
26.8 KB
dashboard/v1/img/mid-img2.png
deleted
100755 → 0
20.3 KB
dashboard/v1/img/process.png
deleted
100755 → 0
3.13 KB
dashboard/v1/img/splash2.png
deleted
100755 → 0
154 KB
dashboard/v1/img/text.ico
deleted
100755 → 0
File deleted
dashboard/v1/index.html
deleted
100755 → 0
dashboard/v1/js/attributes.html
deleted
100755 → 0
dashboard/v1/js/bootstrap.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v1/js/bootstrap.min.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v1/js/controllers.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v1/js/jquery.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v1/js/npm.js
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v1/partials/search.html
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v2/public/img/ApacheAtlasLogo.png
0 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/img/favicon.ico
100755 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/img/process.png
100755 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/img/spinner.gif
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/details/detailsController.js
100755 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/details/detailsModule.js
100755 → 100644
File mode changed from 100755 to 100644
dashboard/v2/public/modules/details/detailsResource.js
100755 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/details/detailsRoutes.js
100755 → 100644
File mode changed from 100755 to 100644
dashboard/v2/public/modules/details/views/attribute.html
100755 → 100644
This diff is collapsed.
Click to expand it.
dashboard/v2/public/modules/details/views/details.html
100755 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v2/server/config/config.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/css/bootstrap-theme.css
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/css/bootstrap.css
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/css/bootstrap.css.map
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/css/bootstrap.min.css
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/css/heroic-features.css
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/css/pagination.css
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/css/style.css
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/img/arrow.png
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/bg1.jpg
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/bg2.jpg
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/img/img1.jpg
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/img1.png
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/img2.png
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/process.png
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/search_icon.jpg
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/search_icon.png
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/img/topbg.jpg
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/index.html
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/js/app.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/js/config.json
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/js/controllers.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This diff is collapsed.
Click to expand it.
dashboard/v3/lib/angular.js
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/lib/angular.min.js
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/lib/angular.min.js.map
deleted
100755 → 0
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
dashboard/v3/lib/bootstrap.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/lib/bootstrap.min.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/lib/d3.tip.v0.6.3.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
dashboard/v3/lib/jquery.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/lib/npm.js
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/partials/search.html
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
dashboard/v3/partials/wiki.html
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
docs/license/d3-LICENSE.txt
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
docs/license/jquery-LICENSE.txt
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
tools/pom.xml
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
tools/src/test/resources/test.thrift
deleted
100755 → 0
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.