tree 2573188772186096de57343ccb30035a57734faf
parent 4b3ce19d8d18d9f7df56a06532723b91ea6949d0
parent e65c0e748c263b8e8c752612730285658a344ec2
author David Pursehouse <dpursehouse@collab.net> 1568010672 +0900
committer David Pursehouse <dpursehouse@collab.net> 1568010672 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Add fixes for --incompatible_load_python_rules_from_bzl
  Bazel: Export rules_python in plugin API
  Support bazelisk or bazel in tools/eclipse/project.py
  Rework imports in project.py
  Update project.py to use argparse
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl

Change-Id: I393d750fa367937e270f11e868a04961b30afc74