Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for Mesos in Kafka Manager #126

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Support for Mesos in Kafka Manager #126

wants to merge 21 commits into from

Commits on Jul 1, 2015

  1. Merge pull request #1 from yahoo/master 

    changes from upstream
    @joestein
    joestein committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    eeab67d View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. dockerize initial commit

    James Oliver committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    ea00bdc View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. Merge pull request #2 from stealthly/docker 

    dockerize initial commit
    @joestein
    joestein committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    da6da9c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. Marathon JSON app definition

    James Oliver committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    ffef152 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. Increase atMost Await duration to 60 seconds to accomodate testing on… 

    … slow machines
    James Oliver committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    f4cecfd View commit details
    Browse the repository at this point in the history

  2. Increase delay between test cases

    James Oliver committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c717733 View commit details
    Browse the repository at this point in the history

  3. Revert timing changes

    James Oliver committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    270c1ca View commit details
    Browse the repository at this point in the history

  4. Disable tests for assembly task

    James Oliver committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    1d317ef View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3 from stealthly/docker 

    Marathon JSON app definition
    @joestein
    joestein committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    dc06988 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4 from yahoo/master 

    upstream fixes
    @joestein
    joestein committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    e163169 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2015

  1. Scheduler REST API integration

    @abiletskyi
    abiletskyi committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    46a53a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2015

  1. Merge pull request #5 from yahoo/master 

    upstream fixes
    @abiletskyi
    abiletskyi committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    2ad8599 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into discover-scheduler

    @abiletskyi
    abiletskyi committed Jul 28, 2015
    Configuration menu
    Copy the full SHA
    3975d1c View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2015

  1. Merge pull request #6 from yahoo/master 

    Upstream changes
    @abiletskyi
    abiletskyi committed Sep 14, 2015
    Configuration menu
    Copy the full SHA
    9b001ad View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2015

  1. Merge upstream changes 

    Conflicts:
	app/controllers/Cluster.scala
	app/kafka/manager/ActorModel.scala
	app/kafka/manager/KafkaManager.scala
	app/models/navigation/Menus.scala
	app/views/index.scala.html
    @abiletskyi
    abiletskyi committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    57748c2 View commit details
    Browse the repository at this point in the history

  2. Post merge fixes to resolve compilation errors

    @abiletskyi
    abiletskyi committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    daee33f View commit details
    Browse the repository at this point in the history

  3. Fixed uris according to latest changes in kafka-mesos

    @abiletskyi
    abiletskyi committed Sep 16, 2015
    Configuration menu
    Copy the full SHA
    9db1d24 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2015

  1. Merge pull request #7 from stealthly/discover-scheduler 

    Discover scheduler and upstream changes
    @joestein
    joestein committed Sep 18, 2015
    Configuration menu
    Copy the full SHA
    c4b4ef2 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2015

  1. Merge remote-tracking branch 'upstream/master' 

    Conflicts:
	app/kafka/manager/KafkaManager.scala
    @sjoerdmulder
    sjoerdmulder committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    1b46d3e View commit details
    Browse the repository at this point in the history

  2. Fixing build by excluding oauth (that contains logging)

    @sjoerdmulder
    sjoerdmulder committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    39e2d0d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from sagentio/master 

    Merge with upstream and fixing build
    @joestein
    joestein committed Nov 18, 2015
    Configuration menu
    Copy the full SHA
    f605ddf View commit details
    Browse the repository at this point in the history