You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by cs...@apache.org on 2015/11/11 22:18:45 UTC
[2/3] incubator-apex-core git commit: Merge conflicts fixed
Merge conflicts fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/49eb57e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/49eb57e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/49eb57e4
Branch: refs/heads/devel-3
Commit: 49eb57e4334027240f1fd91f6bd2d2534d817548
Parents: a198a62 d14ab1e
Author: Ilya Ganelin <il...@capitalone.com>
Authored: Wed Nov 11 13:02:04 2015 -0800
Committer: Ilya Ganelin <il...@capitalone.com>
Committed: Wed Nov 11 13:02:04 2015 -0800
----------------------------------------------------------------------
.idea/codeStyleSettings.xml | 5 +++--
apex_checks.xml | 12 +++++++++++-
api/pom.xml | 2 +-
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------