Skip to content

Conversation

@mbalassi
Copy link
Contributor

These commits have only been pushed to the release-0.8 branch, but to my understanding are also needed on the master.

They contain some minor fixes, dependency, readme and licence clean ups.

StephanEwen and others added 8 commits January 12, 2015 11:33
 - Remove old unused figure image files
 - Add a file clarifying that figures are licensed under ASL 2.0
Conflicts:
	flink-runtime/src/main/resources/web-docs-infoserver/js/flot/chart-data-flot.js
	flink-runtime/src/main/resources/web-docs-infoserver/js/flot/excanvas.min.js
	flink-runtime/src/main/resources/web-docs-infoserver/js/flot/jquery.flot.pie.js
  - Move sling JSON dependency to streaming connectors (prev streaming core)
  - Exclude YARN API from transitive mapreduce-core dependencies we use the dependency
    only for .mapred and .mapreduce interfaces
  - Remove some unnecessary dependencies (junit in java8)
  - Manage Kryo dependency
  - Cleanup minor POM warnings.

Conflicts:
	flink-addons/flink-streaming/flink-streaming-scala/pom.xml
 - Add missing entries for dependencies
 - Remove entries for removed dependencies
 - Change DEPENDENCIES file to point to src and bin LICENSE and NOTICE file
 - Add comments in some files to clarify whether the are Flink original,
   or from which third party file they are adapted
 - Change some links from incubator to TLP

Conflicts:
	DEPENDENCIES
@rmetzger
Copy link
Contributor

Hi,
can you remove the commit "[FLINK-1385] Print warning if not resources are currently available… …" from the pull request?
Since I have a major YARN client rewrite pull request pending, I'll include a fix for the rewrite into the pull request.

@mbalassi
Copy link
Contributor Author

Thanks for the heads up, done.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a typo here. Can you change it to In the Scala API?

@StephanEwen
Copy link
Contributor

I made some comments inline. Otherwise it looks good.

Thanks for work!

Default hadoop version is now hadoop2
Generate specific pom avoids version collisions with dependencies
Updated poms for new release scripts

Conflicts:
	flink-addons/flink-avro/pom.xml
	flink-addons/flink-hadoop-compatibility/pom.xml
	flink-addons/flink-hbase/pom.xml
	flink-addons/flink-jdbc/pom.xml
	flink-addons/flink-spargel/pom.xml
	flink-addons/flink-tachyon/pom.xml
	flink-quickstart/flink-quickstart-java/pom.xml
	flink-quickstart/flink-quickstart-scala/pom.xml
Updated NOTICE files
Updated inceptionYear in pom
@StephanEwen
Copy link
Contributor

I addressed the comments and committed the changes to the 0.9 master. I forgot to add the "This closes #298" message, thought. Marton, can you close this Pull Request manually?

@mbalassi
Copy link
Contributor Author

Thanks, done.

@mbalassi mbalassi closed this Jan 18, 2015
@mbalassi mbalassi deleted the release-0.8-cherry branch April 29, 2015 14:30
zhijiangW pushed a commit to zhijiangW/flink that referenced this pull request Apr 13, 2020
* Co-authored by MarkSfik <47176197+MarkSfik@users.noreply.github.com>

This closes apache#298.
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.

3 participants