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

Upstream changes #6

Merged
merged 36 commits into from
Sep 14, 2015
Merged

Upstream changes #6

merged 36 commits into from
Sep 14, 2015

Conversation

abiletskyi
Copy link

No description provided.

ggrossetie and others added 30 commits July 16, 2015 18:47
@ggrossetie
Messages count history with chart
b1f6334
@jisookim0513
add partitions to multiple topics at once
4e443ba
@jisookim0513
add a test for addPartitionsToMultipleTopics
3ef8cf5
@jisookim0513
throw an error when trying to add partitions to topics without read v…
a6ff559 
…ersion
@jisookim0513
fix a bug of not being able to fill in readVersions in addMultipleTop…
848ee6c 
…icsPartitionsForm
@zheolong
Add logkafka - Collect logs and send lines to Apache Kafka, refer to
2e0c0ee 
https://github.com/Qihoo360/logkafka/
@zheolong
Logkafka
dc93f76 
Add "Enable Logkafka" check box to "Add Cluster" and "Update Cluster" form
When enabled, LogkafkaStateActor and LogkafkaViewCacheActor will be
started
@zheolong
Logkafka
1ccd191 
add LogkafkaCommandActor and two tests
@zheolong
Logkafka
e69b35e 
little fix
@zheolong
Logkafka
29812f5 
Add LogkafkaAdminUtils and LogkafkaZkUtils
@jisookim0513
change syntax for forloop in addPartitionsToTopics
657e4fa
@zheolong
Logkafka
951f035 
change type of logkafka related var to Option in ClusterManagerActor
Fix sbt download repo
38ef80d 
The previous site is 404-ing.
Follow 3xx responses when downloading launcher
fd27962
@jisookim0513
break word for partitions; add DataTable plugin for broker view table…
9f330b1 
…; sort broker partitions and topics
@patelh
Merge pull request #93 from Mogztter/message-count-history
9975d31 
Messages count history with chart
@patelh
Merge pull request #98 from metamx/add-partitions-to-multiple-topics
4d762db 
add partitions to multiple topics at once
@patelh
Merge pull request #104 from patricklucas/fix_sbt_download_repo
c4dd481 
Fix sbt download repo
@patelh
Merge pull request #105 from metamx/ui-improvements
ed3eee1 
Some UI improvements
@patelh
Increment version
07e2494
@zheolong
Logkafka
3ad04a2 
Add logkafka related tests in TestKafkaManager
@zheolong
Merge remote-tracking branch 'upstream/master' into logkafka
b40e0c6 
Conflicts:
	app/kafka/manager/ActorModel.scala
	app/kafka/manager/KafkaManager.scala
	conf/routes
	test/kafka/manager/TestKafkaManager.scala
@zheolong
Logkafka
9e21e13 
Add logkafka related tests in TestClusterManagerActor
@zheolong
Logkafka
5469b71 
Add logkafka related tests in TestKafkaManagerActor
@patelh
First pass at adding feature gates
18d370d
@patelh
Update sbt, play, scala versions
4688fba
@patelh
workaround for missing interpolator
b9c1908
@patelh
Move button on topic view
34be574
@patelh
Update button text on topic view
eafb0a4
@patelh
Add references
1948c93
abiletskyi added a commit that referenced this pull request Sep 14, 2015
@abiletskyi
Merge pull request #6 from yahoo/master
9b001ad 
Upstream changes
@abiletskyi abiletskyi merged commit 9b001ad into elodina:master Sep 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@abiletskyi @ggrossetie @jisookim0513 @zheolong @patelh