merged the changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0df74e91 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0df74e91 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0df74e91 Branch: refs/heads/master Commit: 0df74e91142322d2116de42b7afb1ec4d01dcbaa Parents: 1c00c54 21c9a92 Author: raminder <[email protected]> Authored: Wed Sep 24 16:07:04 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Sep 24 16:07:04 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/server/GfacServerHandler.java | 18 ++- .../airavata/gfac/core/cpi/BetterGfacImpl.java | 16 +-- .../gfac/core/utils/GFacThreadPoolExecutor.java | 35 ++++++ .../gfac/core/utils/InputHandlerWorker.java | 51 ++++++++ .../monitor/impl/pull/qstat/HPCPullMonitor.java | 119 ++++++++++--------- .../impl/push/amqp/SimpleJobFinishConsumer.java | 4 +- 6 files changed, 166 insertions(+), 77 deletions(-) ----------------------------------------------------------------------
