diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-09-18 16:27:27 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-09-25 17:40:49 -0400 |
commit | daaecc315c96f6757a20ca5979c7889c0df02ec9 (patch) | |
tree | 69fc4ddff707d3469b365d7b83e32f57efbe1640 /recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch | |
parent | 492de1f32fc0053b692e3173ea6d3d19052f7c97 (diff) | |
download | meta-cloud-services-daaecc315c96f6757a20ca5979c7889c0df02ec9.tar.gz |
consul: consule-migrate: move from meta-overc
After several requests to make the consul recipe available outside of
meta-overc and the OverC framework we are moving the consul recipes
here. These are a copy from meta-overc (HEAD 6afe8d2c12ac).
NOTE that not all the DEPENDS have been copied as we will follow this
commit with work to make use of SRC_URIs for dependencies. See the
associated commit(s) which will follow this one.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch')
-rw-r--r-- | recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch b/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch new file mode 100644 index 0000000..a66e1dc --- /dev/null +++ b/recipes-connectivity/consul/files/0001-prepared_query-make-compatible-with-go1.5.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From fb11d9e31788c912f94faf8b188278d54dc9a8f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
3 | Date: Wed, 20 Apr 2016 16:34:50 -0400 | ||
4 | Subject: [PATCH] prepared_query: make compatible with go1.5 | ||
5 | |||
6 | The copying of a regex is only in go 1.6. We can take the chance of | ||
7 | lock contention, so we drop the copy and use the regex directly. | ||
8 | |||
9 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | ||
10 | --- | ||
11 | consul/prepared_query/template.go | 4 ++-- | ||
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/consul/prepared_query/template.go b/consul/prepared_query/template.go | ||
15 | index 984f0bcf9cc6..1c61910c1526 100644 | ||
16 | --- a/consul/prepared_query/template.go | ||
17 | +++ b/consul/prepared_query/template.go | ||
18 | @@ -116,8 +116,8 @@ func (ct *CompiledTemplate) Render(name string) (*structs.PreparedQuery, error) | ||
19 | // from multiple goroutines. | ||
20 | var matches []string | ||
21 | if ct.re != nil { | ||
22 | - re := ct.re.Copy() | ||
23 | - matches = re.FindStringSubmatch(name) | ||
24 | + // re := ct.re.Copy() | ||
25 | + matches = ct.re.FindStringSubmatch(name) | ||
26 | } | ||
27 | |||
28 | // Create a safe match function that can't fail at run time. It will | ||
29 | -- | ||
30 | 2.4.0.53.g8440f74 | ||
31 | |||