commit dfb25e8830215aaece109d00cf81d23e106229fb
author Dave Borowitz <dborowitz@google.com> Fri May 24 15:28:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 24 15:28:17 2019 +0000
tree 3f9fee24189efb2e49ebe889f6ccbf2f69a3d250
parent f20d61ab2c38ecee0f40c4d5c979b86ea6894805
parent 73acf2cf40acc858dbb767c75f6bed29c6173891

Merge changes from topic "test-project-update-2"

* changes:
  Push down AbstractDaemonTest#projectOperations
  Inline AbstractDaemonTest#getRemoteHead

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index c39a221..241b6b6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "3bab941eed2637378f9e808b05778325eed2a19b",
+    commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

tools/bzl/classpath.bzl

diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index d5764f7..c921d01 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,4 +1,6 @@
 load(
     "@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
-    "classpath_collector",
+    _classpath_collector = "classpath_collector",
 )
+
+classpath_collector = _classpath_collector

tools/bzl/junit.bzl

diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl
index 3af7e58..97307bd 100644
--- a/tools/bzl/junit.bzl
+++ b/tools/bzl/junit.bzl
@@ -1,4 +1,6 @@
 load(
     "@com_googlesource_gerrit_bazlets//tools:junit.bzl",
-    "junit_tests",
+    _junit_tests = "junit_tests",
 )
+
+junit_tests = _junit_tests

tools/bzl/plugin.bzl

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 0b25d23..4d2dbdd 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,10 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "PLUGIN_DEPS",
-    "PLUGIN_TEST_DEPS",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
+    _plugin_test_deps = "PLUGIN_TEST_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
+PLUGIN_TEST_DEPS = _plugin_test_deps