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

Posted to commits@camel.apache.org by ac...@apache.org on 2018/09/11 07:21:15 UTC

[camel-k] 01/01: Merge pull request #18 from nicolaferraro/master

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 8c409678380fe6e0c4c2ffeed0e967b0528f8058
Merge: b62b092 4b59b14
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Sep 11 09:21:12 2018 +0200

    Merge pull request #18 from nicolaferraro/master
    
    Installation and run works

 .gitignore                                         |   1 +
 build/Makefile                                     |   2 +-
 build/embed_resources.sh                           |   2 +-
 build/package_maven_artifacts.sh                   |   5 +
 deploy/{operator.yaml => operator-deployment.yaml} |   0
 ...tor-role.yaml => operator-role-kubernetes.yaml} |   0
 ...ator-role.yaml => operator-role-openshift.yaml} |  46 +++++-
 deploy/operator.yaml                               |   5 +-
 deploy/resources.go                                | 174 +++++++++++++++++++--
 pkg/install/operator.go                            |   4 +-
 pkg/util/maven/maven.go                            |  15 +-
 tmp/build/Dockerfile                               |  14 +-
 tmp/maven/settings.xml                             |   6 +
 13 files changed, 242 insertions(+), 32 deletions(-)