Code

Support for Mesos in Kafka Manager#126

Code

Open

joestein wants to merge 21 commits intoyahoo:masteryahoo/CMAK:masterfrom elodina:masterelodina/kafka-manager:masterCopy head branch name to clipboard

+2,342-9

Commits

Commits on Jul 1, 2015

• Merge pull request #1 from yahoo/master

  Show description for eeab67d
  joestein

  committed
  eeab67d

Commits on Jul 2, 2015

• dockerize initial commit

  

  James Oliver

  committed
  ea00bdc

Commits on Jul 3, 2015

• Merge pull request #2 from stealthly/docker

  Show description for da6da9c
  joestein

  committed
  da6da9c

Commits on Jul 6, 2015

• Marathon JSON app definition

  

  James Oliver

  committed
  ffef152

Commits on Jul 7, 2015

• Increase atMost Await duration to 60 seconds to accomodate testing on slow machines

  

  James Oliver

  committed
  f4cecfd

• Increase delay between test cases

  

  James Oliver

  committed
  c717733

• Revert timing changes

  

  James Oliver

  committed
  270c1ca

• Disable tests for assembly task

  

  James Oliver

  committed
  1d317ef

• Merge pull request #3 from stealthly/docker

  Show description for dc06988
  joestein

  committed
  dc06988

• Merge pull request #4 from yahoo/master

  Show description for e163169
  joestein

  committed
  e163169

Commits on Jul 27, 2015

• Scheduler REST API integration

  abiletskyi

  committed
  46a53a5

Commits on Jul 28, 2015

• Merge pull request #5 from yahoo/master

  Show description for 2ad8599
  abiletskyi

  committed
  2ad8599

• Merge branch 'master' into discover-scheduler

  abiletskyi

  committed
  3975d1c

Commits on Sep 14, 2015

• Merge pull request #6 from yahoo/master

  Show description for 9b001ad
  abiletskyi

  committed
  9b001ad

Commits on Sep 16, 2015

• Merge upstream changes

  Show description for 57748c2
  abiletskyi

  committed
  57748c2

• Post merge fixes to resolve compilation errors

  abiletskyi

  committed
  daee33f

• Fixed uris according to latest changes in kafka-mesos

  abiletskyi

  committed
  9db1d24

Commits on Sep 18, 2015

• Merge pull request #7 from stealthly/discover-scheduler

  Show description for c4b4ef2
  joestein

  committed
  c4b4ef2

Commits on Nov 18, 2015

• Merge remote-tracking branch 'upstream/master'

  Show description for 1b46d3e
  sjoerdmulder

  committed
  1b46d3e

• Fixing build by excluding oauth (that contains logging)

  sjoerdmulder

  committed
  39e2d0d

• Merge pull request #8 from sagentio/master

  Show description for f605ddf
  joestein

  committed
  f605ddf