You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jv...@apache.org on 2018/06/19 18:29:36 UTC
[trafficcontrol] branch master updated: The PR modifies all files
in the grove directory chaning any imports and other text references to
'incubator-trafficcontrol' to just 'trafficcontrol'
This is an automated email from the ASF dual-hosted git repository.
jvd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 7f53466 The PR modifies all files in the grove directory chaning any imports and other text references to 'incubator-trafficcontrol' to just 'trafficcontrol'
7f53466 is described below
commit 7f5346618daa4d98b7fd1cf9f674650fb7fa6f7f
Author: jrushford <jr...@apache.org>
AuthorDate: Tue Jun 19 10:47:04 2018 -0600
The PR modifies all files in the grove directory chaning any
imports and other text references to 'incubator-trafficcontrol' to
just 'trafficcontrol'
---
grove/README.md | 10 ++++-----
grove/build/grove.spec | 2 +-
grove/cache/handler.go | 18 +++++++--------
grove/cache/responder.go | 12 +++++-----
grove/cache/retryinggetter.go | 16 ++++++-------
grove/cachedata/cachedata.go | 4 ++--
grove/cacheobj/cacheobj.go | 2 +-
grove/config/config.go | 2 +-
grove/diskcache/diskcache.go | 6 ++---
grove/diskcache/multi.go | 6 ++---
grove/grove.go | 26 +++++++++++-----------
grove/grovetccfg/README.md | 8 +++----
grove/grovetccfg/build/build_rpm.sh | 2 +-
grove/grovetccfg/build/grovetccfg.spec | 2 +-
grove/grovetccfg/grovetccfg.go | 16 ++++++-------
grove/icache/icache.go | 2 +-
grove/integration_test/compare_gets.go | 2 +-
grove/integration_test/setup-and-run.sh | 16 ++++++-------
grove/memcache/memcache.go | 6 ++---
grove/plugin/ats_log.go | 4 ++--
grove/plugin/hello_context.go | 2 +-
grove/plugin/hello_world.go | 2 +-
grove/plugin/http_cacheinspector.go | 6 ++---
grove/plugin/http_callgc.go | 4 ++--
grove/plugin/http_memstats.go | 4 ++--
grove/plugin/http_stats.go | 6 ++---
grove/plugin/if_modified_since.go | 2 +-
grove/plugin/modify_headers.go | 4 ++--
grove/plugin/modify_parent_request_headers.go | 4 ++--
grove/plugin/modify_response_headers_global.go | 4 ++--
grove/plugin/plugin.go | 12 +++++-----
grove/plugin/range_req_handler.go | 4 ++--
grove/remap/remap.go | 16 ++++++-------
grove/remapdata/remapdata.go | 6 ++---
grove/rfc/rules.go | 8 +++----
grove/rfc/rules_test.go | 6 ++---
grove/stat/stats.go | 10 ++++-----
grove/stat/stats_test.go | 4 ++--
grove/thread/getter.go | 2 +-
grove/tiercache/tiercache.go | 6 ++---
grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE | 2 +-
grove/web/connmap.go | 2 +-
grove/web/listener.go | 2 +-
grove/web/util.go | 2 +-
44 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/grove/README.md b/grove/README.md
index 80062d2..d258d25 100644
--- a/grove/README.md
+++ b/grove/README.md
@@ -39,13 +39,13 @@ go get golang.org/x/net/ipv6
* golang.org/x must be updated when the Go compiler is, so we treat it as part of the compiler, rather than vendoring it like other dependencies, to avoid breaking updating to newer compilers than we internally work with. If you know what you're doing, feel free to skip this step, or omit `rm` of old `go get` source and packages.
3. Clone this repository into your GOPATH.
```bash
-mkdir -p $GOPATH/src/github.com/apache/incubator-trafficcontrol
-cd $GOPATH/src/github.com/apache/incubator-trafficcontrol
-git clone https://github.com/apache/incubator-trafficcontrol/grove
+mkdir -p $GOPATH/src/github.com/apache/trafficcontrol
+cd $GOPATH/src/github.com/apache/trafficcontrol
+git clone https://github.com/apache/trafficcontrol/grove
```
4. Build the application
```bash
-cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove
+cd $GOPATH/src/github.com/apache/trafficcontrol/grove
go build
```
6. Install and configure an RPM development environment
@@ -103,7 +103,7 @@ The config file has the following fields:
The remap rules file is specified in the [config file](#configuration).
-Note there exists a tool for generating remap rules from [Traffic Control](https://github.com/apache/incubator-trafficcontrol), available [here](https://github.com/apache/incubator-trafficcontrol/grove/tree/master/grovetccfg).
+Note there exists a tool for generating remap rules from [Traffic Control](https://github.com/apache/trafficcontrol), available [here](https://github.com/apache/trafficcontrol/grove/tree/master/grovetccfg).
The remap rules file is JSON of the following form:
diff --git a/grove/build/grove.spec b/grove/build/grove.spec
index abe34d2..6ed87f0 100644
--- a/grove/build/grove.spec
+++ b/grove/build/grove.spec
@@ -18,7 +18,7 @@ License: Apache License, Version 2.0
Group: Base System/System Tools
Prefix: /usr/sbin/%{name}
Source: %{_sourcedir}/%{name}-%{version}.tgz
-URL: https://github.com/apache/incubator-trafficcontrol/%{name}
+URL: https://github.com/apache/trafficcontrol/%{name}
Distribution: CentOS Linux
Vendor: Apache Software Foundation
BuildRoot: %{buildroot}
diff --git a/grove/cache/handler.go b/grove/cache/handler.go
index 0b4e15e..a1ff499 100644
--- a/grove/cache/handler.go
+++ b/grove/cache/handler.go
@@ -22,17 +22,17 @@ import (
"time"
"unsafe"
- "github.com/apache/incubator-trafficcontrol/grove/cachedata"
- "github.com/apache/incubator-trafficcontrol/grove/plugin"
+ "github.com/apache/trafficcontrol/grove/cachedata"
+ "github.com/apache/trafficcontrol/grove/plugin"
- "github.com/apache/incubator-trafficcontrol/grove/remap"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/rfc"
- "github.com/apache/incubator-trafficcontrol/grove/stat"
- "github.com/apache/incubator-trafficcontrol/grove/thread"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/rfc"
+ "github.com/apache/trafficcontrol/grove/stat"
+ "github.com/apache/trafficcontrol/grove/thread"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type HandlerPointer struct {
diff --git a/grove/cache/responder.go b/grove/cache/responder.go
index a211f0e..60b9b39 100644
--- a/grove/cache/responder.go
+++ b/grove/cache/responder.go
@@ -18,13 +18,13 @@ import (
"net/http"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cachedata"
- "github.com/apache/incubator-trafficcontrol/grove/plugin"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/stat"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/cachedata"
+ "github.com/apache/trafficcontrol/grove/plugin"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/stat"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
// Responder is an object encapsulating the cache's response to the client. It holds all the data necessary to respond, log the response, and add the stats.
diff --git a/grove/cache/retryinggetter.go b/grove/cache/retryinggetter.go
index 427e96f..48c82e6 100644
--- a/grove/cache/retryinggetter.go
+++ b/grove/cache/retryinggetter.go
@@ -20,14 +20,14 @@ import (
"net/url"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/grove/remap"
- "github.com/apache/incubator-trafficcontrol/grove/rfc"
- "github.com/apache/incubator-trafficcontrol/grove/thread"
- "github.com/apache/incubator-trafficcontrol/grove/web"
-
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/rfc"
+ "github.com/apache/trafficcontrol/grove/thread"
+ "github.com/apache/trafficcontrol/grove/web"
+
+ "github.com/apache/trafficcontrol/lib/go-log"
)
const CodeConnectFailure = http.StatusBadGateway
diff --git a/grove/cachedata/cachedata.go b/grove/cachedata/cachedata.go
index d627b3c..a036474 100644
--- a/grove/cachedata/cachedata.go
+++ b/grove/cachedata/cachedata.go
@@ -20,8 +20,8 @@ import (
"net/http"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/web"
)
// ParentResponseData contains data about the parent/origin response.
diff --git a/grove/cacheobj/cacheobj.go b/grove/cacheobj/cacheobj.go
index c05888f..f4c22f0 100644
--- a/grove/cacheobj/cacheobj.go
+++ b/grove/cacheobj/cacheobj.go
@@ -18,7 +18,7 @@ import (
"net/http"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
)
type CacheObj struct {
diff --git a/grove/config/config.go b/grove/config/config.go
index 857d4f6..70e0903 100644
--- a/grove/config/config.go
+++ b/grove/config/config.go
@@ -18,7 +18,7 @@ import (
"encoding/json"
"io/ioutil"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
const bytesPerGibibyte = 1024 * 1024 * 1024
diff --git a/grove/diskcache/diskcache.go b/grove/diskcache/diskcache.go
index a8e1b30..eee9909 100644
--- a/grove/diskcache/diskcache.go
+++ b/grove/diskcache/diskcache.go
@@ -21,10 +21,10 @@ import (
"sync/atomic"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/lru"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/lru"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
bolt "github.com/coreos/bbolt"
)
diff --git a/grove/diskcache/multi.go b/grove/diskcache/multi.go
index d877c2d..4d300ce 100644
--- a/grove/diskcache/multi.go
+++ b/grove/diskcache/multi.go
@@ -17,10 +17,10 @@ package diskcache
import (
"errors"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/config"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/config"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
"github.com/dchest/siphash"
)
diff --git a/grove/grove.go b/grove/grove.go
index 55dc2ee..99ed55b 100644
--- a/grove/grove.go
+++ b/grove/grove.go
@@ -34,19 +34,19 @@ import (
"golang.org/x/net/http2"
"golang.org/x/sys/unix"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
-
- "github.com/apache/incubator-trafficcontrol/grove/cache"
- "github.com/apache/incubator-trafficcontrol/grove/config"
- "github.com/apache/incubator-trafficcontrol/grove/diskcache"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/grove/memcache"
- "github.com/apache/incubator-trafficcontrol/grove/plugin"
- "github.com/apache/incubator-trafficcontrol/grove/remap"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/stat"
- "github.com/apache/incubator-trafficcontrol/grove/tiercache"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/lib/go-log"
+
+ "github.com/apache/trafficcontrol/grove/cache"
+ "github.com/apache/trafficcontrol/grove/config"
+ "github.com/apache/trafficcontrol/grove/diskcache"
+ "github.com/apache/trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/memcache"
+ "github.com/apache/trafficcontrol/grove/plugin"
+ "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/stat"
+ "github.com/apache/trafficcontrol/grove/tiercache"
+ "github.com/apache/trafficcontrol/grove/web"
)
const ShutdownTimeout = 60 * time.Second
diff --git a/grove/grovetccfg/README.md b/grove/grovetccfg/README.md
index a251a21..9374a30 100644
--- a/grove/grovetccfg/README.md
+++ b/grove/grovetccfg/README.md
@@ -27,13 +27,13 @@ Traffic Control configuration generator for the Grove HTTP caching proxy.
* See https://golang.org/doc/install
2. Clone this repository into your GOPATH.
```bash
-mkdir -p $GOPATH/src/github.com/apache/incubator-trafficcontrol
-cd $GOPATH/src/github.com/apache/incubator-trafficcontrol
-git clone https://github.com/apache/incubator-trafficcontrol/grove
+mkdir -p $GOPATH/src/github.com/apache/trafficcontrol
+cd $GOPATH/src/github.com/apache/trafficcontrol
+git clone https://github.com/apache/trafficcontrol/grove
```
3. Build the application
```bash
-cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/grovetccfg
+cd $GOPATH/src/github.com/apache/trafficcontrol/grove/grovetccfg
go build
```
5. Install and configure an RPM development environment
diff --git a/grove/grovetccfg/build/build_rpm.sh b/grove/grovetccfg/build/build_rpm.sh
index bb55aa9..bf03f1d 100755
--- a/grove/grovetccfg/build/build_rpm.sh
+++ b/grove/grovetccfg/build/build_rpm.sh
@@ -22,7 +22,7 @@ mkdir -p $BUILDDIR/{BUILD,RPMS,SOURCES}
echo "$BUILDDIR" > ~/.rpmmacros
# get traffic_ops client
-# godir=src/github.com/apache/incubator-trafficcontrol/traffic_ops/client
+# godir=src/github.com/apache/trafficcontrol/traffic_ops/client
# ( mkdir -p "$godir" && \
# cd "$godir" && \
# cp -r ${GOPATH}/${godir}/* . && \
diff --git a/grove/grovetccfg/build/grovetccfg.spec b/grove/grovetccfg/build/grovetccfg.spec
index 4deb440..ae654a3 100644
--- a/grove/grovetccfg/build/grovetccfg.spec
+++ b/grove/grovetccfg/build/grovetccfg.spec
@@ -18,7 +18,7 @@ License: Apache License, Version 2.0
Group: Base System/System Tools
Prefix: /usr/sbin/%{name}
Source: %{_sourcedir}/%{name}-%{version}.tgz
-URL: https://github.com/apache/incubator-trafficcontrol/%{name}
+URL: https://github.com/apache/trafficcontrol/%{name}
Distribution: CentOS Linux
Vendor: Apache Software Foundation
BuildRoot: %{buildroot}
diff --git a/grove/grovetccfg/grovetccfg.go b/grove/grovetccfg/grovetccfg.go
index 0e9db10..7e6897c 100644
--- a/grove/grovetccfg/grovetccfg.go
+++ b/grove/grovetccfg/grovetccfg.go
@@ -32,14 +32,14 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/lib/go-tc"
- tcv13 "github.com/apache/incubator-trafficcontrol/lib/go-tc/v13"
- to "github.com/apache/incubator-trafficcontrol/traffic_ops/client"
-
- "github.com/apache/incubator-trafficcontrol/grove/config"
- "github.com/apache/incubator-trafficcontrol/grove/remap"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/lib/go-tc"
+ tcv13 "github.com/apache/trafficcontrol/lib/go-tc/v13"
+ to "github.com/apache/trafficcontrol/traffic_ops/client"
+
+ "github.com/apache/trafficcontrol/grove/config"
+ "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/web"
)
// Duplicating Hdr and ModHdrs here for now...
diff --git a/grove/icache/icache.go b/grove/icache/icache.go
index 8a82dd1..3735321 100644
--- a/grove/icache/icache.go
+++ b/grove/icache/icache.go
@@ -15,7 +15,7 @@ package icache
*/
import (
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
)
// TODO change to return errors
diff --git a/grove/integration_test/compare_gets.go b/grove/integration_test/compare_gets.go
index b88cb69..0cf7ac6 100644
--- a/grove/integration_test/compare_gets.go
+++ b/grove/integration_test/compare_gets.go
@@ -17,7 +17,7 @@ package main
import (
"flag"
"fmt"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
"io/ioutil"
"log"
"net/http"
diff --git a/grove/integration_test/setup-and-run.sh b/grove/integration_test/setup-and-run.sh
index f16612f..c9132ba 100644
--- a/grove/integration_test/setup-and-run.sh
+++ b/grove/integration_test/setup-and-run.sh
@@ -35,9 +35,9 @@ go get golang.org/x/net/ipv6
mkdir -p $GOPATH/src/github.com/apache/
cd $GOPATH/src/github.com/apache/
-#git clone https://github.com/apache/incubator-trafficcontrol
+#git clone https://github.com/apache/trafficcontrol
git clone $REPO
-cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove
+cd $GOPATH/src/github.com/apache/trafficcontrol/grove
git checkout $BRANCH
go build
@@ -46,13 +46,13 @@ openssl req -newkey rsa:2048 -new -nodes -x509 -days 365 -keyout key.pem -out ce
cp /remap-base-test.json /remap.json
ls -l
-${GOPATH}/src/github.com/apache/incubator-trafficcontrol/grove/grove -cfg grove.cfg &
+${GOPATH}/src/github.com/apache/trafficcontrol/grove/grove -cfg grove.cfg &
sleep 3
curl -H'Host: mem-test.cdn.kabletown.net' -Lsv -r 50000-50009 http://localhost:8080/10Mb.txt
-#cd $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test
+#cd $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test
go build compare_gets.go
#function run_test () {
@@ -91,12 +91,12 @@ function run_test () {
}
export -f run_test
-cp $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/remap.json /remap.json
+cp $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/modify_headers/remap.json /remap.json
pkill -HUP grove
-bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh
+bash $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/modify_headers/test.sh
-cp $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/remap.json /remap.json
+cp $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/remap.json /remap.json
pkill -HUP grove
-bash $GOPATH/src/github.com/apache/incubator-trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh
+bash $GOPATH/src/github.com/apache/trafficcontrol/grove/integration_test/tests/plugins/range_req_handler/test.sh
diff --git a/grove/memcache/memcache.go b/grove/memcache/memcache.go
index 29d0217..388be05 100644
--- a/grove/memcache/memcache.go
+++ b/grove/memcache/memcache.go
@@ -18,10 +18,10 @@ import (
"sync"
"sync/atomic"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/lru"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/lru"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
// MemCache is a threadsafe memory cache with a soft byte limit, enforced via LRU.
diff --git a/grove/plugin/ats_log.go b/grove/plugin/ats_log.go
index 3b885f3..b40f7a4 100644
--- a/grove/plugin/ats_log.go
+++ b/grove/plugin/ats_log.go
@@ -19,9 +19,9 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
const NSPerSec = 1000000000
diff --git a/grove/plugin/hello_context.go b/grove/plugin/hello_context.go
index 69ffce5..8071a5c 100644
--- a/grove/plugin/hello_context.go
+++ b/grove/plugin/hello_context.go
@@ -15,7 +15,7 @@ package plugin
*/
import (
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/hello_world.go b/grove/plugin/hello_world.go
index 6e3f811..ff3a1f8 100644
--- a/grove/plugin/hello_world.go
+++ b/grove/plugin/hello_world.go
@@ -15,7 +15,7 @@ package plugin
*/
import (
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/http_cacheinspector.go b/grove/plugin/http_cacheinspector.go
index 9409aee..9bb56d1 100644
--- a/grove/plugin/http_cacheinspector.go
+++ b/grove/plugin/http_cacheinspector.go
@@ -23,11 +23,11 @@ import (
"strings"
"code.cloudfoundry.org/bytefmt"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/rfc"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/grove/rfc"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/http_callgc.go b/grove/plugin/http_callgc.go
index 992513b..d5871dd 100644
--- a/grove/plugin/http_callgc.go
+++ b/grove/plugin/http_callgc.go
@@ -20,9 +20,9 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/http_memstats.go b/grove/plugin/http_memstats.go
index 7a35a47..61af745 100644
--- a/grove/plugin/http_memstats.go
+++ b/grove/plugin/http_memstats.go
@@ -20,9 +20,9 @@ import (
"runtime"
"strings"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/http_stats.go b/grove/plugin/http_stats.go
index 8958696..b698d2a 100644
--- a/grove/plugin/http_stats.go
+++ b/grove/plugin/http_stats.go
@@ -25,10 +25,10 @@ import (
"strings"
"unicode"
- "github.com/apache/incubator-trafficcontrol/grove/stat"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/stat"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/if_modified_since.go b/grove/plugin/if_modified_since.go
index be8ca05..7f0d3de 100644
--- a/grove/plugin/if_modified_since.go
+++ b/grove/plugin/if_modified_since.go
@@ -17,7 +17,7 @@ package plugin
import (
"net/http"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
)
func init() {
diff --git a/grove/plugin/modify_headers.go b/grove/plugin/modify_headers.go
index 8146c2a..e0ae86f 100644
--- a/grove/plugin/modify_headers.go
+++ b/grove/plugin/modify_headers.go
@@ -17,9 +17,9 @@ package plugin
import (
"encoding/json"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/modify_parent_request_headers.go b/grove/plugin/modify_parent_request_headers.go
index bcf8764..4822cde 100644
--- a/grove/plugin/modify_parent_request_headers.go
+++ b/grove/plugin/modify_parent_request_headers.go
@@ -17,9 +17,9 @@ package plugin
import (
"encoding/json"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/modify_response_headers_global.go b/grove/plugin/modify_response_headers_global.go
index 48de792..bedec39 100644
--- a/grove/plugin/modify_response_headers_global.go
+++ b/grove/plugin/modify_response_headers_global.go
@@ -17,9 +17,9 @@ package plugin
import (
"encoding/json"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func init() {
diff --git a/grove/plugin/plugin.go b/grove/plugin/plugin.go
index b084fef..d5f113e 100644
--- a/grove/plugin/plugin.go
+++ b/grove/plugin/plugin.go
@@ -25,12 +25,12 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cachedata"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/config"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/stat"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/cachedata"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/config"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/stat"
+ "github.com/apache/trafficcontrol/grove/web"
)
func AddPlugin(priority uint64, funcs Funcs) {
diff --git a/grove/plugin/range_req_handler.go b/grove/plugin/range_req_handler.go
index 2bc4774..d6e556d 100644
--- a/grove/plugin/range_req_handler.go
+++ b/grove/plugin/range_req_handler.go
@@ -23,8 +23,8 @@ import (
"strconv"
"strings"
- "github.com/apache/incubator-trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type byteRange struct {
diff --git a/grove/remap/remap.go b/grove/remap/remap.go
index b21f279..af0e825 100644
--- a/grove/remap/remap.go
+++ b/grove/remap/remap.go
@@ -25,14 +25,14 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/chash"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/grove/plugin"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/rfc"
- "github.com/apache/incubator-trafficcontrol/grove/web"
-
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/grove/chash"
+ "github.com/apache/trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/plugin"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/rfc"
+ "github.com/apache/trafficcontrol/grove/web"
+
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type HTTPRequestRemapper interface {
diff --git a/grove/remapdata/remapdata.go b/grove/remapdata/remapdata.go
index 2961a0b..706c499 100644
--- a/grove/remapdata/remapdata.go
+++ b/grove/remapdata/remapdata.go
@@ -24,10 +24,10 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/chash"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/chash"
+ "github.com/apache/trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type Reuse int
diff --git a/grove/rfc/rules.go b/grove/rfc/rules.go
index 1879bc7..15d3b85 100644
--- a/grove/rfc/rules.go
+++ b/grove/rfc/rules.go
@@ -23,11 +23,11 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
"math"
"strconv"
)
diff --git a/grove/rfc/rules_test.go b/grove/rfc/rules_test.go
index f364aad..e4314b8 100644
--- a/grove/rfc/rules_test.go
+++ b/grove/rfc/rules_test.go
@@ -24,10 +24,10 @@ import (
"testing"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
func TestRules(t *testing.T) {
diff --git a/grove/stat/stats.go b/grove/stat/stats.go
index 7823f72..360b030 100644
--- a/grove/stat/stats.go
+++ b/grove/stat/stats.go
@@ -20,12 +20,12 @@ import (
"sync/atomic"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/grove/remapdata"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/remapdata"
+ "github.com/apache/trafficcontrol/grove/web"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type StatsSystem interface {
diff --git a/grove/stat/stats_test.go b/grove/stat/stats_test.go
index 805105b..9f17d58 100644
--- a/grove/stat/stats_test.go
+++ b/grove/stat/stats_test.go
@@ -20,8 +20,8 @@ import (
"testing"
"time"
- "github.com/apache/incubator-trafficcontrol/grove/remap"
- "github.com/apache/incubator-trafficcontrol/grove/web"
+ "github.com/apache/trafficcontrol/grove/remap"
+ "github.com/apache/trafficcontrol/grove/web"
)
func StatsInc(m *web.ConnMap, num int, addrs *[]string) {
diff --git a/grove/thread/getter.go b/grove/thread/getter.go
index 63f53e8..849fd2b 100644
--- a/grove/thread/getter.go
+++ b/grove/thread/getter.go
@@ -17,7 +17,7 @@ package thread
import (
"sync"
- cacheobj "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
+ cacheobj "github.com/apache/trafficcontrol/grove/cacheobj"
)
type Getter interface {
diff --git a/grove/tiercache/tiercache.go b/grove/tiercache/tiercache.go
index 418d10a..ff844ff 100644
--- a/grove/tiercache/tiercache.go
+++ b/grove/tiercache/tiercache.go
@@ -15,10 +15,10 @@ package tiercache
*/
import (
- "github.com/apache/incubator-trafficcontrol/grove/cacheobj"
- "github.com/apache/incubator-trafficcontrol/grove/icache"
+ "github.com/apache/trafficcontrol/grove/cacheobj"
+ "github.com/apache/trafficcontrol/grove/icache"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
// TierCache wraps two icache.Caches and implements icache.Cache. Adding adds to both caches. Getting tries the first cache first, and if it isn't found, it then tries the second. Thus, the first should be smaller and faster (memory) and the second should be larger and slower (disk).
diff --git a/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE b/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE
index f49a4e1..261eeb9 100644
--- a/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE
+++ b/grove/vendor/code.cloudfoundry.org/bytefmt/LICENSE
@@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
+ limitations under the License.
diff --git a/grove/web/connmap.go b/grove/web/connmap.go
index 01fea05..493df83 100644
--- a/grove/web/connmap.go
+++ b/grove/web/connmap.go
@@ -17,7 +17,7 @@ package web
import (
"net"
"sync"
- // "github.com/apache/incubator-trafficcontrol/traffic_monitor_golang/common/log"
+ // "github.com/apache/trafficcontrol/traffic_monitor_golang/common/log"
)
type ConnMap struct {
diff --git a/grove/web/listener.go b/grove/web/listener.go
index f5316e5..15873be 100644
--- a/grove/web/listener.go
+++ b/grove/web/listener.go
@@ -24,7 +24,7 @@ import (
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type InterceptListener struct {
diff --git a/grove/web/util.go b/grove/web/util.go
index 4d36e08..3066274 100644
--- a/grove/web/util.go
+++ b/grove/web/util.go
@@ -22,7 +22,7 @@ import (
"strings"
"time"
- "github.com/apache/incubator-trafficcontrol/lib/go-log"
+ "github.com/apache/trafficcontrol/lib/go-log"
)
type Hdr struct {