You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/30 20:17:43 UTC

[50/50] [abbrv] stratos git commit: Resolve conflicts

Resolve conflicts


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

Branch: refs/heads/master
Commit: 08dac042ea2215ee8664dd8ca1b4adee466b9acb
Parents: 9b1d272 eefef71
Author: Akila Perera <ra...@gmail.com>
Authored: Sun Aug 30 23:45:41 2015 +0530
Committer: Akila Perera <ra...@gmail.com>
Committed: Sun Aug 30 23:45:41 2015 +0530

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

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