Merge branch 'master' into new-workflow-design
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/29a0e4b6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/29a0e4b6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/29a0e4b6 Branch: refs/heads/master Commit: 29a0e4b61ea68044a0c4ce97a8ca62e8b8d1231a Parents: 0db33d2 c05d5e6 Author: shamrath <[email protected]> Authored: Thu Mar 19 15:35:19 2015 -0400 Committer: shamrath <[email protected]> Committed: Thu Mar 19 15:35:19 2015 -0400 ---------------------------------------------------------------------- .../api/server/util/RegistryInitUtil.java | 43 +++++++++++++++----- 1 file changed, 32 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
