Merge "v.io/jiri: make jiri project info usable from outside of a project."
diff --git a/jiri-test/internal/test/release.go b/jiri-test/internal/test/release.go
index cd09ddf..dd2b6e9 100644
--- a/jiri-test/internal/test/release.go
+++ b/jiri-test/internal/test/release.go
@@ -56,7 +56,6 @@
"applicationd",
"binaryd",
"deviced",
- "groupsd",
"identityd",
"mounttabled",
"xproxyd",
@@ -67,7 +66,6 @@
nonMounttableApps = []string{
"devmgr/apps/applicationd",
"devmgr/apps/binaryd",
- "devmgr/apps/groupsd",
"devmgr/apps/identityd",
"devmgr/apps/roled",
"devmgr/apps/xproxyd",
@@ -100,7 +98,6 @@
"jiri",
"go",
"install",
- "-tags=leveldb",
}
args = append(args, pkgs...)
u.outputCmd(args)
@@ -586,7 +583,7 @@
},
step{
msg: "Check manifest timestamps of all apps",
- fn: func() error { return u.checkManifestTimestamps("devmgr/apps/*/*/*", rcTimestamp, 8) },
+ fn: func() error { return u.checkManifestTimestamps("devmgr/apps/*/*/*", rcTimestamp, 7) },
},
step{
msg: "Update device manager",
diff --git a/jiridoc/doc.go b/jiridoc/doc.go
index 0322773..04f2cd5 100644
--- a/jiridoc/doc.go
+++ b/jiridoc/doc.go
@@ -808,12 +808,16 @@
-exit-on-error=false
If set, all commands will killed as soon as one reports an error, otherwise,
each will run to completion.
+ -has-branch=
+ A regular expression specifying branch names to use in matching projects. A
+ project will match if the specified branch exists, even if it is not checked
+ out.
-has-gerrit-message=false
If specified, match branches that have, or have no, gerrit message
-has-uncommitted=false
If specified, match projects that have, or have no, uncommitted changes
-has-untracked=false
- if specified, match projects that have, or have no, untracked files
+ If specified, match projects that have, or have no, untracked files
-interactive=true
If set, the command to be run is interactive and should not have its
stdout/stderr manipulated. This flag cannot be used with -show-name-prefix,
diff --git a/vmon/servicecommon.go b/vmon/servicecommon.go
index 2a963e0..8672069 100644
--- a/vmon/servicecommon.go
+++ b/vmon/servicecommon.go
@@ -35,7 +35,6 @@
snBinaryDischarger = "binary discharger"
snRole = "role service"
snProxy = "proxy service"
- snGroups = "groups service"
hostnameStatSuffix = "__debug/stats/system/hostname"
zoneStatSuffix = "__debug/stats/system/gce/zone"
@@ -53,7 +52,6 @@
snBinaryDischarger: "identity/dev.v.io:u/discharger",
snRole: "identity/role",
snProxy: "proxy-mon",
- snGroups: "groups",
}
type aggregator struct {
diff --git a/vmon/servicelatency.go b/vmon/servicelatency.go
index 89d6b70..ebc2dc3 100644
--- a/vmon/servicelatency.go
+++ b/vmon/servicelatency.go
@@ -43,7 +43,6 @@
snBinaryDischarger,
snRole,
snProxy,
- snGroups,
}
hasError := false
diff --git a/vmon/servicemetadata.go b/vmon/servicemetadata.go
index ab831c7..5d7e6d1 100644
--- a/vmon/servicemetadata.go
+++ b/vmon/servicemetadata.go
@@ -32,7 +32,6 @@
snApplications,
snBinaries,
snIdentity,
- snGroups,
snRole,
snProxy,
}
diff --git a/vmon/servicemethodlatency.go b/vmon/servicemethodlatency.go
index 6f69521..cd7f5db 100644
--- a/vmon/servicemethodlatency.go
+++ b/vmon/servicemethodlatency.go
@@ -38,7 +38,6 @@
snBinaries,
snApplications,
snIdentity,
- snGroups,
snRole,
snProxy,
}
diff --git a/vmon/serviceqps.go b/vmon/serviceqps.go
index 3c2899e..6512209 100644
--- a/vmon/serviceqps.go
+++ b/vmon/serviceqps.go
@@ -43,7 +43,6 @@
snIdentity,
snRole,
snProxy,
- snGroups,
}
hasError := false
