atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [14/14] incubator-atlas git commit: Merge remote-tracking branch 'origin/master' into feature-odf
Date Sun, 09 Jul 2017 15:07:52 GMT
Merge remote-tracking branch 'origin/master' into feature-odf


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/f24d94fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/f24d94fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/f24d94fa

Branch: refs/heads/feature-odf
Commit: f24d94fad5af6517cb98c657ef308166f0834cf3
Parents: 6d19e12 ee8c81d
Author: Madhan Neethiraj <madhan@apache.org>
Authored: Sun Jul 9 08:07:10 2017 -0700
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Sun Jul 9 08:07:10 2017 -0700

----------------------------------------------------------------------
 3party-licenses/bootstrap-datepicker-LICENSE    |   21 -
 .../bootstrap-daterangepicker-LICENSE           |    9 +
 3party-licenses/jQuery-QueryBuilder-LICENSE     |   21 +
 LICENSE                                         |    9 +-
 .../java/org/apache/atlas/AtlasAdminClient.java |    2 +-
 .../java/org/apache/atlas/AtlasBaseClient.java  |   33 +-
 .../main/java/org/apache/atlas/AtlasClient.java |   35 +-
 .../java/org/apache/atlas/AtlasClientV2.java    |   44 +-
 .../java/org/apache/atlas/AtlasClientTest.java  |   10 +-
 .../org/apache/atlas/repository/Constants.java  |    4 +-
 dashboardv2/gruntfile.js                        |  114 +-
 dashboardv2/package.json                        |    5 +
 dashboardv2/public/css/scss/form.scss           |    4 +
 dashboardv2/public/css/scss/override.scss       |   21 +
 dashboardv2/public/css/scss/search.scss         |   17 +
 dashboardv2/public/index.html                   |    3 +-
 dashboardv2/public/js/collection/VSearchList.js |   11 +
 dashboardv2/public/js/collection/VTagList.js    |    2 +-
 .../datetimepicker/bootstrap-datetimepicker.js  | 2444 ------------------
 .../bootstrap-datetimepicker.min.css            |    5 -
 dashboardv2/public/js/main.js                   |   28 +-
 dashboardv2/public/js/models/VSearch.js         |    2 +-
 dashboardv2/public/js/models/VTag.js            |    6 +-
 dashboardv2/public/js/router/Router.js          |   65 +-
 .../js/templates/search/QueryBuilder_tmpl.html  |   17 +
 .../templates/search/SearchLayoutView_tmpl.html |   22 +-
 .../js/templates/search/SearchQuery_tmpl.html   |   21 +
 .../search/SearchResultLayoutView_tmpl.html     |   15 +
 .../templates/tag/AddTagAttributeView_tmpl.html |    2 +-
 .../templates/tag/createTagLayoutView_tmpl.html |    2 +-
 dashboardv2/public/js/utils/Overrides.js        |    5 +-
 dashboardv2/public/js/utils/UrlLinks.js         |   38 +-
 dashboardv2/public/js/utils/Utils.js            |   68 +-
 .../views/business_catalog/SideNavLayoutView.js |   10 +-
 .../js/views/entity/CreateEntityLayoutView.js   |   29 +-
 .../public/js/views/search/QueryBuilderView.js  |  181 ++
 .../js/views/search/SearchDetailLayoutView.js   |    3 +-
 .../public/js/views/search/SearchLayoutView.js  |  181 +-
 .../public/js/views/search/SearchQueryView.js   |  113 +
 .../js/views/search/SearchResultLayoutView.js   |  113 +-
 .../public/js/views/tag/TagDetailLayoutView.js  |    3 +-
 .../public/js/views/tag/TagLayoutView.js        |    6 +-
 .../public/js/views/tag/addTagModalView.js      |   42 +-
 distro/src/conf/atlas-log4j.xml                 |   17 +
 docs/src/site/twiki/Export-API.twiki            |    2 +-
 docs/src/site/twiki/Export-HDFS-API.twiki       |    2 +-
 docs/src/site/twiki/Import-API-Options.twiki    |  113 +
 docs/src/site/twiki/Import-API.twiki            |   17 +-
 docs/src/site/twiki/Import-Export-API.twiki     |    7 +-
 .../repository/graphdb/AtlasGraphQuery.java     |   39 +-
 .../repository/graphdb/AtlasIndexQuery.java     |    8 +
 .../repository/graphdb/AtlasVertexQuery.java    |   16 +-
 .../titan/query/NativeTitanGraphQuery.java      |   25 +-
 .../graphdb/titan/query/TitanGraphQuery.java    |   65 +-
 .../graphdb/titan/query/expr/AndCondition.java  |    8 +-
 .../graphdb/titan/query/expr/HasPredicate.java  |    7 +-
 .../query/graph/GraphCentricQueryBuilder.java   |   28 +-
 .../graphdb/titan0/Titan0IndexQuery.java        |   21 +
 .../graphdb/titan0/Titan0VertexQuery.java       |   15 +
 .../titan0/query/NativeTitan0GraphQuery.java    |   92 +-
 .../graphdb/titan1/Titan1IndexQuery.java        |   22 +
 .../graphdb/titan1/Titan1VertexQuery.java       |   14 +
 .../titan1/query/NativeTitan1GraphQuery.java    |   90 +-
 .../java/org/apache/atlas/AtlasErrorCode.java   |    3 +-
 .../model/discovery/AtlasSearchResult.java      |   28 +-
 .../atlas/model/discovery/SearchParameters.java |  366 +++
 .../atlas/model/impexp/AtlasImportRequest.java  |   15 +-
 .../atlas/type/AtlasRelationshipType.java       |   22 +-
 .../atlas/type/TestAtlasRelationshipType.java   |   36 +-
 .../atlas/discovery/AtlasDiscoveryService.java  |    9 +
 .../atlas/discovery/EntityDiscoveryService.java |   34 +-
 .../atlas/discovery/EntityLineageService.java   |    2 +
 .../org/apache/atlas/discovery/GremlinStep.java |  389 +++
 .../apache/atlas/discovery/SearchPipeline.java  |  611 +++++
 .../org/apache/atlas/discovery/SolrStep.java    |  288 +++
 .../graph/GraphBackedSearchIndexer.java         |   41 +-
 .../atlas/repository/impexp/ImportService.java  |    5 +-
 .../store/graph/v1/AtlasGraphUtilsV1.java       |    5 +-
 .../graph/v1/AtlasRelationshipDefStoreV1.java   |   40 +-
 .../store/graph/v1/EntityGraphRetriever.java    |   26 +-
 .../org/apache/atlas/util/SearchTracker.java    |   73 +
 .../test/java/org/apache/atlas/TestModules.java |   17 +-
 .../services/EntityDiscoveryServiceTest.java    |    8 +
 .../filters/StaleTransactionCleanupFilter.java  |    2 +-
 .../atlas/web/resources/AdminResource.java      |   43 +-
 .../apache/atlas/web/rest/DiscoveryREST.java    |   47 +
 .../atlas/web/resources/AdminResourceTest.java  |    4 +-
 87 files changed, 3666 insertions(+), 2842 deletions(-)
----------------------------------------------------------------------



Mime
View raw message