You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2014/11/22 05:01:28 UTC

[2/2] stratos git commit: Merge branch 'rest-api-refact' of https://git-wip-us.apache.org/repos/asf/stratos into rest-api-refact

Merge branch 'rest-api-refact' of https://git-wip-us.apache.org/repos/asf/stratos into rest-api-refact

Conflicts:
	components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV41.java


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

Branch: refs/heads/rest-api-refact
Commit: eb7179d21d109b06705419c79203799d976fa878
Parents: e14820f c122576
Author: Udara Liyanage <ud...@wso2.com>
Authored: Sat Nov 22 09:31:07 2014 +0530
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Sat Nov 22 09:31:07 2014 +0530

----------------------------------------------------------------------

----------------------------------------------------------------------