Merge branch 'dal' of github.com:MPR-Global/metadata into apache-local
Conflicts:
dashboard/v2/package.json
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/d6f5d9da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/d6f5d9da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/d6f5d9da
Branch: refs/heads/master
Commit: d6f5d9da692c54464c0e25abb82e841a9cd849a1
Parents: 6b33bcf 11b78ad
Author: Venkatesh Seetharam <[email protected]>
Authored: Mon Jun 22 14:44:23 2015 -0700
Committer: Venkatesh Seetharam <[email protected]>
Committed: Mon Jun 22 14:44:23 2015 -0700
----------------------------------------------------------------------
dashboard/v2/.gitignore | 2 +-
dashboard/v2/README.md | 1 +
dashboard/v2/bower.json | 2 +-
dashboard/v2/gruntfile.js | 18 ++------
dashboard/v2/package.json | 6 +--
dashboard/v2/public/js/app.js | 20 ++++++--
.../v2/public/modules/home/views/home.html | 2 +-
.../public/modules/lineage/lineageController.js | 30 ++++++------
.../modules/navigation/navigationResource.js | 2 +-
.../v2/public/modules/search/searchRoutes.js | 1 -
dashboard/v2/server.js | 48 --------------------
11 files changed, 44 insertions(+), 88 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/d6f5d9da/dashboard/v2/package.json
----------------------------------------------------------------------
diff --cc dashboard/v2/package.json
index 1cf2f87,7fb0821..a81ce2c
--- a/dashboard/v2/package.json
+++ b/dashboard/v2/package.json
@@@ -1,12 -1,11 +1,11 @@@
{
- "name": "Apache-Atlas",
+ "name": "atlas-metadata",
"description": "Apache Atlas",
- "version": "1.0.0-SNAPSHOT",
+ "version": "0.5.0-incubating",
"private": true,
- "bin": "server.js",
"repository": {
"type": "git",
- "url": "https://github.com/hortonworks/metadata";
+ "url": "https://git-wip-us.apache.org/repos/asf/incubator-atlas.git";
},
"engines": {
"node": "0.10.x",
