airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [2/6] airavata git commit: Merge remote-tracking branch 'origin/master'
Date Fri, 25 Sep 2015 19:09:14 GMT
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/commons/src/main/java/org/apache/airavata/common/utils/ZkConstants.java


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/47f161b3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/47f161b3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/47f161b3

Branch: refs/heads/master
Commit: 47f161b354f8e670391d30c10d5534e44040dfc3
Parents: 3a2d694 2640e89
Author: Suresh Marru <smarru@apache.org>
Authored: Fri Sep 4 11:08:06 2015 -0400
Committer: Suresh Marru <smarru@apache.org>
Committed: Fri Sep 4 11:08:06 2015 -0400

----------------------------------------------------------------------
 .../airavata/common/utils/ZkConstants.java      | 24 ++++++++++++++++++++
 1 file changed, 24 insertions(+)
----------------------------------------------------------------------



Mime
View raw message