Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/449eb757 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/449eb757 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/449eb757 Branch: refs/heads/master Commit: 449eb75766ca02e0445731c9a76d639c9f204bc3 Parents: c38b3b6 4b048e1 Author: Suresh Marru <[email protected]> Authored: Wed May 13 15:51:16 2015 -0400 Committer: Suresh Marru <[email protected]> Committed: Wed May 13 15:51:16 2015 -0400 ---------------------------------------------------------------------- .../AiravataExperimentStatusUpdator.java | 2 +- .../gfac/states/GfacExperimentState.java | 88 ---- .../gfac/states/GfacExperimentStatus.java | 516 ------------------- .../airavata/gfac/states/GfacHandlerState.java | 67 --- .../gfac/states/gfacDataModelConstants.java | 59 --- .../gfac/core/states/GfacExperimentState.java | 25 +- .../gfacDataModel.thrift | 1 + .../server/OrchestratorServerHandler.java | 5 - .../registry/jpa/impl/ExperimentRegistry.java | 54 +- 9 files changed, 64 insertions(+), 753 deletions(-) ----------------------------------------------------------------------
