This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch staging in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 021ff948dd59ad133ffad421cb2de91b7cead3e5 Merge: 5867892 0f66b45 Author: dimuthu <[email protected]> AuthorDate: Mon Apr 23 16:29:12 2018 -0400 Merge branch 'develop' into staging # Conflicts: # dev-tools/ansible/helix.yml dev-tools/ansible/helix.yml | 22 +- .../standalone/group_vars/helix/vars.yml} | 27 +- dev-tools/ansible/inventories/standalone/hosts | 6 + .../ansible/roles/helix_setup/defaults/main.yml | 46 ++++ dev-tools/ansible/roles/helix_setup/tasks/main.yml | 103 ++++++++ .../controller/airavata-server.properties.j2} | 23 +- .../templates/controller/logback.xml.j2 | 53 ++++ .../participant/airavata-server.properties.j2 | 65 +++++ .../templates/participant/logback.xml.j2 | 53 ++++ .../post-wm/airavata-server.properties.j2 | 54 ++++ .../helix_setup/templates/post-wm/logback.xml.j2 | 53 ++++ .../templates/pre-wm/airavata-server.properties.j2 | 51 ++++ .../helix_setup/templates/pre-wm/logback.xml.j2 | 53 ++++ .../ansible/roles/job_monitor/defaults/main.yml | 50 ++++ dev-tools/ansible/roles/job_monitor/tasks/main.yml | 82 ++++++ .../email-monitor/airavata-server.properties.j2 | 278 +++++++++++++++++++++ .../templates/email-monitor/email-config.yaml.j2 | 21 ++ .../templates/email-monitor/logback.xml.j2 | 53 ++++ .../airavata-server.properties.j2} | 20 +- .../templates/realtime-monitor/logback.xml.j2 | 53 ++++ dev-tools/ansible/roles/kafka/defaults/main.yml | 48 ++++ .../{helix.yml => roles/kafka/handlers/main.yml} | 16 +- dev-tools/ansible/roles/kafka/tasks/main.yml | 70 ++++++ .../ansible/roles/kafka/templates/kafka.service.j2 | 14 ++ .../roles/kafka/templates/server.properties.j2 | 139 +++++++++++ 25 files changed, 1415 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
