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.

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

jarek/5780: reduce duplication in evaluators #5788

Merged
merged 24 commits into from
Aug 11, 2017

Conversation

jaroslawmalekcodete
Copy link
Contributor

No description provided.

# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
#	kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/kernel/ClojureEvaluator.java
#	kernel/cpp/src/main/java/com/twosigma/beakerx/cpp/kernel/CppEvaluator.java
#	kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
#	kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java
#	kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java
#	kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java
#	kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java
# Conflicts:
#	kernel/base/src/main/java/com/twosigma/beakerx/evaluator/BaseEvaluator.java
#	kernel/clojure/src/main/java/com/twosigma/beakerx/clojure/kernel/ClojureEvaluator.java
#	kernel/cpp/src/main/java/com/twosigma/beakerx/cpp/kernel/CppEvaluator.java
#	kernel/groovy/src/main/java/com/twosigma/beakerx/groovy/evaluator/GroovyEvaluator.java
#	kernel/java/src/main/java/com/twosigma/beakerx/javash/evaluator/JavaEvaluator.java
#	kernel/kotlin/src/main/java/com/twosigma/beakerx/kotlin/evaluator/KotlinEvaluator.java
#	kernel/scala/src/main/java/com/twosigma/beakerx/scala/evaluator/ScalaEvaluator.java
#	kernel/sql/src/main/java/com/twosigma/beakerx/sql/evaluator/SQLEvaluator.java
@scottdraves scottdraves merged commit 71bb795 into master Aug 11, 2017
michalgce added a commit that referenced this pull request Aug 21, 2017
* origin/master: (21 commits)
  better source linking, fix missing rel instruction
  bump version to 0.2.4
  bump version to 0.2.3
  workaround #5864
  fix error setupbase.py on windows (#5863)
  bump version to 0.2.2, fix #5861
  also install our config for the kernelspec manager
  install our custom css, update author email and website url, add keywords
  install nbextension, rename entry point for installer, document in readme
  Leif/fix packaging (#5857)
  Fix "kernels" cmd (#5849)
  update version, correct location of version file
  #5726: use pypi instead of github (#5797)
  #5810 Fixed lsmagic output. (#5839)
  #5782 allow setting dpi for png export (#5841)
  #5909 Fixed Magic import with no arg. (#5840)
  jarek/5780: reduce duplication in evaluators  (#5788)
  #5767 add links to jvm-repr doc, improve tablesaw doc (#5835)
  remove "Table Saw"
  #5597 make widgets publishable (#5830)
  ...

# Conflicts:
#	beakerx/js/webpack.config.js
#	beakerx/setup.py
@jaroslawmalekcodete jaroslawmalekcodete deleted the jarek/5780_evaluators_reduce_duplication branch December 18, 2017 08:41
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.

2 participants