You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/09/03 08:54:33 UTC
[6/8] stratos git commit: resolve merge conflicts
resolve merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2b891628
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2b891628
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2b891628
Branch: refs/heads/master
Commit: 2b89162858c8edd80002a873cf9d940cae1f7815
Parents: 61fa5aa c0fdd4a
Author: anuruddhal <an...@gmail.com>
Authored: Wed Sep 2 14:49:02 2015 +0530
Committer: anuruddhal <an...@gmail.com>
Committed: Wed Sep 2 14:49:02 2015 +0530
----------------------------------------------------------------------
.../group/GroupStatusProcessorChain.java | 4 +-
extensions/cep/pom.xml | 2 +-
.../src/main/bin/nginx-extension.sh | 3 +
.../nginx/extension/NginxConfigWriter.java | 143 +++++++++++++------
.../modules/distribution/src/assembly/bin.xml | 2 +-
5 files changed, 105 insertions(+), 49 deletions(-)
----------------------------------------------------------------------