Merge pull request #1182 from coreos/cors

pkg: move cors.go to /pkg/cors.go
This commit is contained in:
Xiang Li 2014-09-25 11:49:04 -07:00
commit 9e46d54483
2 changed files with 5 additions and 5 deletions

View File

@ -45,7 +45,7 @@ var (
peers = &etcdhttp.Peers{}
addrs = &Addrs{}
cors = &CORSInfo{}
cors = &pkg.CORSInfo{}
proxyFlag = new(ProxyFlag)
proxyFlagValues = []string{
@ -208,11 +208,11 @@ func startEtcd() {
}
s.Start()
ch := &CORSHandler{
ch := &pkg.CORSHandler{
Handler: etcdhttp.NewClientHandler(s, *peers, *timeout),
Info: cors,
}
ph := &CORSHandler{
ph := &pkg.CORSHandler{
Handler: etcdhttp.NewPeerHandler(s),
Info: cors,
}
@ -255,7 +255,7 @@ func startProxy() {
log.Fatal(err)
}
ph = &CORSHandler{
ph = &pkg.CORSHandler{
Handler: ph,
Info: cors,
}

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package main
package pkg
import (
"fmt"