Skip to content

Conversation

@yourspraveen
Copy link
Contributor

Cluster Read only option,
Java 9+ ambitious method resolution issue with Properties and HashTable

yourspraveen and others added 11 commits March 23, 2017 18:31
…yahoo-master

# Conflicts:
#	app/controllers/Logkafka.scala
#	app/controllers/Topic.scala
#	app/kafka/manager/actor/cluster/KafkaStateActor.scala
#	app/kafka/manager/model/model.scala
#	app/kafka/manager/utils/LogkafkaNewConfigs.scala
#	app/kafka/manager/utils/TopicConfigs.scala
#	app/models/form/ClusterOperation.scala
#	app/models/navigation/Menus.scala
#	app/views/cluster/addCluster.scala.html
#	app/views/cluster/updateCluster.scala.html
#	app/views/topic/topicList.scala.html
#	app/views/topic/topicViewContent.scala.html
#	build.sbt
#	project/build.properties
#	project/plugins.sbt
#	test/kafka/manager/TestClusterManagerActor.scala
#	test/kafka/manager/TestKafkaManager.scala
#	test/kafka/manager/utils/TestClusterConfig.scala

Merge with Yahoo repo and with restrictions applied on top
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant