Merge remote-tracking branch 'upstream/phase1' into phase1 rebasing codebase
Project: http://git-wip-us.apache.org/repos/asf/incubator-myriad/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-myriad/commit/235f91a0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-myriad/tree/235f91a0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-myriad/diff/235f91a0 Branch: refs/heads/phase1 Commit: 235f91a0236078688c8cda2373c91eb95c818975 Parents: 4149927 f95ad7c Author: Brandon Gulla <blgu...@rd6um-34106l.infosec.tycho.ncsc.mil> Authored: Wed Jun 10 13:37:07 2015 -0400 Committer: Brandon Gulla <blgu...@rd6um-34106l.infosec.tycho.ncsc.mil> Committed: Wed Jun 10 13:37:07 2015 -0400 ---------------------------------------------------------------------- README.md | 1 + build.gradle | 33 +- docker/README.md | 8 +- docker/build-myriad.sh | 5 - docker/myriad-bin/install-yarn.sh | 65 +- docker/myriad-bin/run-myriad.sh | 5 +- docs/myriad-configuration.md | 12 +- docs/myriad-dashboard.md | 28 + .../myriad-remote-distribution-configuration.md | 52 + setup-yarn-2.sh | 2 +- .../com/ebay/myriad/api/ClustersResource.java | 10 +- .../ebay/myriad/api/ConfigurationResource.java | 2 +- .../com/ebay/myriad/api/DashboardResource.java | 50 - .../ebay/myriad/api/SchedulerStateResource.java | 2 +- .../configuration/MyriadConfiguration.java | 15 + .../MyriadExecutorConfiguration.java | 9 +- .../configuration/NodeManagerConfiguration.java | 7 - .../ebay/myriad/executor/MyriadExecutor.java | 3 +- .../com/ebay/myriad/executor/NMTaskConfig.java | 10 +- .../com/ebay/myriad/scheduler/TaskFactory.java | 120 +- .../com/ebay/myriad/views/DashboardView.java | 60 - .../myriad/webapp/HttpConnectorProvider.java | 1 + .../ebay/myriad/webapp/MyriadServletModule.java | 5 +- .../com/ebay/myriad/webapp/MyriadWebServer.java | 8 +- src/main/resources/assets/css/bootstrap.min.css | 5 - src/main/resources/assets/css/myriad.css | 13 - src/main/resources/assets/js/bootstrap.min.js | 6 - .../assets/js/ie10-viewport-bug-workaround.js | 22 - src/main/resources/banner.txt | 3 +- .../com/ebay/myriad/views/clusters.mustache | 0 .../com/ebay/myriad/views/dashboard.mustache | 0 .../com/ebay/myriad/views/health.mustache | 0 .../com/ebay/myriad/views/master.mustache | 106 - .../com/ebay/myriad/views/state.mustache | 0 src/main/resources/myriad-config-default.yml | 12 +- src/main/resources/webapp/.gitignore | 2 + .../webapp/css/bootstrap-default.min.css | 5 + .../webapp/css/bootstrap-slate.min.css | 7 + src/main/resources/webapp/css/bootstrap.min.css | 7 + src/main/resources/webapp/css/myriad.css | 25 + src/main/resources/webapp/gulpfile.js | 102 + src/main/resources/webapp/img/favicon.ico | Bin 0 -> 1150 bytes src/main/resources/webapp/index.html | 16 + src/main/resources/webapp/js/app.js | 27 + .../webapp/js/components/AboutComponent.js | 30 + .../webapp/js/components/ConfigComponent.js | 36 + .../webapp/js/components/FlexComponent.js | 22 + .../webapp/js/components/FlexDownComponent.js | 108 + .../webapp/js/components/FlexUpComponent.js | 135 + .../resources/webapp/js/components/Myriad.js | 105 + .../webapp/js/components/NavbarComponent.js | 36 + .../webapp/js/components/ProfileComponent.js | 21 + .../webapp/js/components/RawJSONComponent.js | 18 + .../webapp/js/components/TaskListComponent.js | 19 + .../webapp/js/components/TasksComponent.js | 37 + src/main/resources/webapp/js/flux/Constants.js | 6 + src/main/resources/webapp/package.json | 40 + .../webapp/public/css/bootstrap-default.min.css | 5 + .../webapp/public/css/bootstrap-slate.min.css | 7 + .../webapp/public/css/bootstrap.min.css | 7 + src/main/resources/webapp/public/css/myriad.css | 25 + .../resources/webapp/public/img/favicon.ico | Bin 0 -> 1150 bytes src/main/resources/webapp/public/index.html | 16 + src/main/resources/webapp/public/js/myriad.js | 38646 +++++++++++++++++ 64 files changed, 39837 insertions(+), 353 deletions(-) ----------------------------------------------------------------------
