View | Details | Raw Unified | Return to bug 205140 | Differences between
and this patch

Collapse All | Expand All

(-)influxdb/Makefile (-14 / +29 lines)
Lines 1-7 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	influxdb
3
PORTNAME=	influxdb
4
PORTVERSION=	0.9.4.1
4
PORTVERSION=	0.9.5.1
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
CATEGORIES=	databases net-mgmt
6
CATEGORIES=	databases net-mgmt
7
7
Lines 25-47 Link Here
25
		boltdb:bolt \
25
		boltdb:bolt \
26
		cheffo:crypto,go_uuid \
26
		cheffo:crypto,go_uuid \
27
		collectd:go_collectd \
27
		collectd:go_collectd \
28
		dgryski:go_bits \
29
		dgryski:go_bitstream \
28
		fatih:pool \
30
		fatih:pool \
29
		gogo:gogo_protobuf \
31
		gogo:gogo_protobuf \
30
		golang:golang_protobuf,golang_snappy \
32
		golang:golang_protobuf,golang_snappy \
31
		hashicorp:raft,raft_boltdb,go_msgpack \
33
		hashicorp:raft,raft_boltdb,go_msgpack \
34
		influxdb:enterprise_client \
35
		jwilder:encoding \
32
		kimor79:gollectd \
36
		kimor79:gollectd \
33
		peterh:liner \
37
		peterh:liner \
34
		rakyll:statik
38
		rakyll:statik
35
GH_PROJECT=	bolt:bolt crypto:crypto go-collectd:go_collectd go-metrics:go_metrics \
39
GH_PROJECT=	bolt:bolt crypto:crypto encoding:encoding \
36
		go-msgpack:go_msgpack gollectd:gollectd liner:liner \
40
		enterprise-client:enterprise_client go-bits:go_bits \
37
		log4go:log4go pat:pat pool:pool protobuf:gogo_protobuf \
41
		go-bitstream:go_bitstream go-collectd:go_collectd \
38
		protobuf:golang_protobuf raft-boltdb:raft_boltdb raft:raft \
42
		go-metrics:go_metrics go-msgpack:go_msgpack gollectd:gollectd \
43
		liner:liner log4go:log4go pat:pat pool:pool \
44
		protobuf:gogo_protobuf protobuf:golang_protobuf \
45
		raft-boltdb:raft_boltdb raft:raft \
39
		snappy:golang_snappy, statik:statik toml:toml go-uuid:go_uuid
46
		snappy:golang_snappy, statik:statik toml:toml go-uuid:go_uuid
40
GH_TAGNAME=	0c24824:bolt 056c9bc:toml 1351f93:crypto 1bb0d1c:liner \
47
GH_TAGNAME=	b34b35e:bolt 056c9bc:toml 1351f93:crypto 4d47685:liner \
41
		1bcc57d:log4go 274df12:statik 932b70a:gogo_protobuf \
48
		5c3c713:log4go 274df12:statik e492fd3:gogo_protobuf \
42
		61d0dee:gollectd 1dceb1a:golang_protobuf 6c5fa0d:go_metrics \
49
		61d0dee:gollectd 68415e7:golang_protobuf 06b6099:go_metrics \
43
		b8a3500:pat cba550e:pool d1e82c1:raft_boltdb ed3ca8a:go_uuid \
50
		b8a3500:pat cba550e:pool d1e82c1:raft_boltdb ed3ca8a:go_uuid \
44
		9dabbba:raft fa3f638:go_msgpack 723cc1e:golang_snappy a1cfcc9:go_collectd
51
		d136cd1:raft fa3f638:go_msgpack 723cc1e:golang_snappy \
52
		9fc824c:go_collectd 86c69b3:go_bits 27cd597:go_bitstream \
53
		07d88d4:encoding 25665cb:enterprise_client
45
54
46
SUB_FILES=	influxd
55
SUB_FILES=	influxd
47
SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
56
SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
Lines 75-100 Link Here
75
	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
84
	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
76
	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
85
	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
77
	@${MKDIR} ${WRKSRC}/src/collectd.org
86
	@${MKDIR} ${WRKSRC}/src/collectd.org
87
	@${MKDIR} ${WRKSRC}/src/github.com/dgryski
78
	@${MKDIR} ${WRKSRC}/src/github.com/fatih
88
	@${MKDIR} ${WRKSRC}/src/github.com/fatih
79
	@${MKDIR} ${WRKSRC}/src/github.com/gogo
89
	@${MKDIR} ${WRKSRC}/src/github.com/gogo
80
	@${MKDIR} ${WRKSRC}/src/github.com/golang
90
	@${MKDIR} ${WRKSRC}/src/github.com/golang
81
	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
91
	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
92
	@${MKDIR} ${WRKSRC}/src/github.com/jwilder
82
	@${MKDIR} ${WRKSRC}/src/github.com/influxdb
93
	@${MKDIR} ${WRKSRC}/src/github.com/influxdb
83
	@${MKDIR} ${WRKSRC}/src/github.com/kimor79
94
	@${MKDIR} ${WRKSRC}/src/github.com/kimor79
84
	@${MKDIR} ${WRKSRC}/src/github.com/peterh
95
	@${MKDIR} ${WRKSRC}/src/github.com/peterh
85
	@${MKDIR} ${WRKSRC}/src/github.com/rakyll
96
	@${MKDIR} ${WRKSRC}/src/github.com/rakyll
86
	@${MKDIR} ${WRKSRC}/src/golang.org/x
97
	@${MKDIR} ${WRKSRC}/src/golang.org/x
87
	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
98
	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
88
.for src in CHANGELOG.md CONTRIBUTING.md DOCKER.md Dockerfile \
99
.for src in LICENSE_OF_DEPENDENCIES.md Makefile build-docker.sh build.py \
89
	LICENSE QUERIES.md README.md \
100
	circle-test.sh circle.yml client cluster cmd errors.go etc importer \
90
	balancer.go balancer_test.go build-docker.sh circle-test.sh circle.yml client \
101
	influxql influxvar.go meta models monitor nightly.sh package.sh \
91
	cluster cmd errors.go etc importer influxql influxvar.go meta monitor package.sh pkg \
102
	pkg scripts services shared snapshot statik stress tcp \
92
	scripts services shared snapshot statik tcp tests toml tsdb uuid
103
	test-32bit-docker.sh tests toml tsdb uuid
93
	@${MV} ${WRKSRC}/${src} \
104
	@${MV} ${WRKSRC}/${src} \
94
		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
105
		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
95
.endfor
106
.endfor
96
	@${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt
107
	@${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt
97
	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
108
	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
109
	@${MV} ${WRKSRC_encoding} ${WRKSRC}/src/github.com/jwilder/encoding
110
	@${MV} ${WRKSRC_enterprise_client} ${WRKSRC}/src/github.com/influxdb/enterprise-client
111
	@${MV} ${WRKSRC_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits
112
	@${MV} ${WRKSRC_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream
98
	@${MV} ${WRKSRC_go_collectd}/api ${WRKSRC}/src/collectd.org/api
113
	@${MV} ${WRKSRC_go_collectd}/api ${WRKSRC}/src/collectd.org/api
99
	@${MV} ${WRKSRC_go_collectd}/network ${WRKSRC}/src/collectd.org/network
114
	@${MV} ${WRKSRC_go_collectd}/network ${WRKSRC}/src/collectd.org/network
100
	@${MV} ${WRKSRC_go_collectd}/cdtime ${WRKSRC}/src/collectd.org/cdtime
115
	@${MV} ${WRKSRC_go_collectd}/cdtime ${WRKSRC}/src/collectd.org/cdtime
(-)influxdb/distinfo (-18 / +26 lines)
Lines 1-38 Link Here
1
SHA256 (influxdb-influxdb-v0.9.4.1_GH0.tar.gz) = a15dcb1173ca4016111d2d8dcea75c098f10838f54d67256b384e65b1cbcf2de
1
SHA256 (influxdb-influxdb-v0.9.5.1_GH0.tar.gz) = d823288a826188526831602ee834195266abb7d4a0db7c3638d8f86793a0ffd6
2
SIZE (influxdb-influxdb-v0.9.4.1_GH0.tar.gz) = 977672
2
SIZE (influxdb-influxdb-v0.9.5.1_GH0.tar.gz) = 1115599
3
SHA256 (alecthomas-log4go-1bcc57d_GH0.tar.gz) = f15f25fb0d4d88ce9817f1a04c32c5ca7cf35358615b61601ef47be388733604
3
SHA256 (alecthomas-log4go-5c3c713_GH0.tar.gz) = ea492017025d02f1204ba744fc01130b547da7e07b661598cac83a3ca63c6255
4
SIZE (alecthomas-log4go-1bcc57d_GH0.tar.gz) = 16190
4
SIZE (alecthomas-log4go-5c3c713_GH0.tar.gz) = 16187
5
SHA256 (armon-go-metrics-6c5fa0d_GH0.tar.gz) = d70e7e6d7243cb447eaf017a713952e421c948a303c96fe8052d2d060e20aec1
5
SHA256 (armon-go-metrics-06b6099_GH0.tar.gz) = 9536fa2418200cc060edeb24fa3c778abbed7dfce626784663aa39b411477a8a
6
SIZE (armon-go-metrics-6c5fa0d_GH0.tar.gz) = 13221
6
SIZE (armon-go-metrics-06b6099_GH0.tar.gz) = 13229
7
SHA256 (BurntSushi-toml-056c9bc_GH0.tar.gz) = 73125940543e2922a77bee42f068f35383b5e260e5fbab867efcb7a59a05671a
7
SHA256 (BurntSushi-toml-056c9bc_GH0.tar.gz) = 73125940543e2922a77bee42f068f35383b5e260e5fbab867efcb7a59a05671a
8
SIZE (BurntSushi-toml-056c9bc_GH0.tar.gz) = 37104
8
SIZE (BurntSushi-toml-056c9bc_GH0.tar.gz) = 37104
9
SHA256 (bmizerany-pat-b8a3500_GH0.tar.gz) = 6468a8b27db2bed1edf6eb845da6f7466221c7b0b41112d77710e4ac76926a2f
9
SHA256 (bmizerany-pat-b8a3500_GH0.tar.gz) = 6468a8b27db2bed1edf6eb845da6f7466221c7b0b41112d77710e4ac76926a2f
10
SIZE (bmizerany-pat-b8a3500_GH0.tar.gz) = 5205
10
SIZE (bmizerany-pat-b8a3500_GH0.tar.gz) = 5205
11
SHA256 (boltdb-bolt-0c24824_GH0.tar.gz) = 04f492fafbead764d60c7ba707d08f05a056c439cb6d0796aae12f5b6f00087e
11
SHA256 (boltdb-bolt-b34b35e_GH0.tar.gz) = e1ab58b0a50d6b3537b0c5be8d5ef358ddcd64ecb112cadd9046173af1747156
12
SIZE (boltdb-bolt-0c24824_GH0.tar.gz) = 73122
12
SIZE (boltdb-bolt-b34b35e_GH0.tar.gz) = 76007
13
SHA256 (cheffo-crypto-1351f93_GH0.tar.gz) = 29ddf6009158914fb35f9d8e27c48164428dedac6a1314215e1717ae913d96f0
13
SHA256 (cheffo-crypto-1351f93_GH0.tar.gz) = 29ddf6009158914fb35f9d8e27c48164428dedac6a1314215e1717ae913d96f0
14
SIZE (cheffo-crypto-1351f93_GH0.tar.gz) = 860364
14
SIZE (cheffo-crypto-1351f93_GH0.tar.gz) = 860364
15
SHA256 (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 3ad72804ee9b735add1039ec8cffd445fefd66852a3b7c0b82baf428696ca921
15
SHA256 (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 3ad72804ee9b735add1039ec8cffd445fefd66852a3b7c0b82baf428696ca921
16
SIZE (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 41022
16
SIZE (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 41022
17
SHA256 (collectd-go-collectd-a1cfcc9_GH0.tar.gz) = b68e435de580367f5d9f4892419af0e6ed83f749b661eba7c79c6b15f4e8a444
17
SHA256 (collectd-go-collectd-9fc824c_GH0.tar.gz) = 4d6f6d88f85e48eff7fa5443145ab62c30463b102dbcc70c3309519b7e01e546
18
SIZE (collectd-go-collectd-a1cfcc9_GH0.tar.gz) = 24543
18
SIZE (collectd-go-collectd-9fc824c_GH0.tar.gz) = 24548
19
SHA256 (dgryski-go-bits-86c69b3_GH0.tar.gz) = 92e7227b8527dacd387bd89536b8d349e7d57131ead1071329a94133a5e67780
20
SIZE (dgryski-go-bits-86c69b3_GH0.tar.gz) = 2137
21
SHA256 (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 9bd56e5019d84d31b7ffd68feca5f61db683588c9bb2033763dfc84c99d5c370
22
SIZE (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 2801
19
SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
23
SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
20
SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
24
SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
21
SHA256 (gogo-protobuf-932b70a_GH0.tar.gz) = 718ff983992cf9e5db22bafa100045c429f3c3d90bb3639a62ebf166a7fac149
25
SHA256 (gogo-protobuf-e492fd3_GH0.tar.gz) = 914aafa56baa6c24c24c8732b53c09b111a4324b7a50d3bb9af4ec3797d03c47
22
SIZE (gogo-protobuf-932b70a_GH0.tar.gz) = 1255330
26
SIZE (gogo-protobuf-e492fd3_GH0.tar.gz) = 1570750
23
SHA256 (golang-protobuf-1dceb1a_GH0.tar.gz) = 92845bb399851159d849e7c347ffdf07238a10a371f95e46fff149a4cd0f40a0
27
SHA256 (golang-protobuf-68415e7_GH0.tar.gz) = 5b54f372d62be2b0a13a2d757950d922b4ccdd12180178798bcd4927a26848a0
24
SIZE (golang-protobuf-1dceb1a_GH0.tar.gz) = 162466
28
SIZE (golang-protobuf-68415e7_GH0.tar.gz) = 178721
25
SHA256 (golang-snappy-723cc1e_GH0.tar.gz) = 205b26745b6ceb62b762f07282842cafb4f4b0395b9ab14b0349a990e299fbed
29
SHA256 (golang-snappy-723cc1e_GH0.tar.gz) = 205b26745b6ceb62b762f07282842cafb4f4b0395b9ab14b0349a990e299fbed
26
SIZE (golang-snappy-723cc1e_GH0.tar.gz) = 10075
30
SIZE (golang-snappy-723cc1e_GH0.tar.gz) = 10075
27
SHA256 (hashicorp-raft-9dabbba_GH0.tar.gz) = bc35eea32cd7c9ab05ba0be1d177e5996d864243237e90a892942f9514cb0570
31
SHA256 (hashicorp-raft-d136cd1_GH0.tar.gz) = 550bfaed021d46ffe6ae4873c43125c934d69d6210c2c422fa33ea0205a79516
28
SIZE (hashicorp-raft-9dabbba_GH0.tar.gz) = 58878
32
SIZE (hashicorp-raft-d136cd1_GH0.tar.gz) = 59284
29
SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
33
SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
30
SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
34
SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
31
SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
35
SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
32
SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
36
SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
37
SHA256 (influxdb-enterprise-client-25665cb_GH0.tar.gz) = 867a109025936d030b1d43e35df4e88ed7a9f267c8bf33b5e110293f6c7ef694
38
SIZE (influxdb-enterprise-client-25665cb_GH0.tar.gz) = 6531
39
SHA256 (jwilder-encoding-07d88d4_GH0.tar.gz) = c061d88b954e13a5c1c74b964e9b56c9a670f3f3ec8c8f563827f5323b8e2ae7
40
SIZE (jwilder-encoding-07d88d4_GH0.tar.gz) = 9462
33
SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498
41
SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498
34
SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508
42
SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508
35
SHA256 (peterh-liner-1bb0d1c_GH0.tar.gz) = 0ed1d975b6af46820eb55826527a9ab0263376da5a20e94b21695e21267f6f2e
43
SHA256 (peterh-liner-4d47685_GH0.tar.gz) = 49dbb396f03cdb4358955066db8411bc51eade6e294688a456c771f76e50d276
36
SIZE (peterh-liner-1bb0d1c_GH0.tar.gz) = 16925
44
SIZE (peterh-liner-4d47685_GH0.tar.gz) = 18603
37
SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49
45
SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49
38
SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898
46
SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898
(-)influxdb/files/patch-cluster_shard__writer.go (-2 / +2 lines)
Lines 1-9 Link Here
1
--- cluster/shard_writer.go.orig	2015-06-23 14:38:36 UTC
1
--- cluster/shard_writer.go.orig	2015-12-08 15:03:30 UTC
2
+++ cluster/shard_writer.go
2
+++ cluster/shard_writer.go
3
@@ -7,7 +7,7 @@ import (
3
@@ -7,7 +7,7 @@ import (
4
 
4
 
5
 	"github.com/influxdb/influxdb/meta"
5
 	"github.com/influxdb/influxdb/meta"
6
 	"github.com/influxdb/influxdb/tsdb"
6
 	"github.com/influxdb/influxdb/models"
7
-	"gopkg.in/fatih/pool.v2"
7
-	"gopkg.in/fatih/pool.v2"
8
+	"github.com/fatih/pool"
8
+	"github.com/fatih/pool"
9
 )
9
 )

Return to bug 205140