Attachment 168886 Details for Bug 207400 – minor fixes, new version of patch for influxdb-0.11.1

[patch] minor fixes, new version of patch for influxdb-0.11.1

influxdb.diff (text/plain), 14.60 KB, created by Palle Girgensohn on 2016-04-02 02:05:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Palle Girgensohn

Created: 2016-04-02 02:05:04 UTC

Size: 14.60 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 412367)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	influxdb
>-PORTVERSION=	0.10.0
>+PORTVERSION=	0.11.1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	databases net-mgmt
> 
>@@ -17,70 +17,29 @@
> USE_RC_SUBR=	influxd
> 
> USE_GITHUB=	yes
>-GH_ACCOUNT=	influxdb:DEFAULT \
>-		BurntSushi:BurntSushi_toml \
>-		armon:armon_go_metrics \
>-		bmizerany:bmizerany_pat \
>-		boltdb:boltdb_bolt \
>-		collectd:collectd_go_collectd \
>-		davecgh:davecgh_go_spew \
>-		dgryski:dgryski_go_bits \
>-		dgryski:dgryski_go_bitstream \
>-		fatih:fatih_pool \
>-		gogo:gogo_protobuf \
>-		golang:golang_crypto,golang_snappy \
>-		hashicorp:hashicorp_go_msgpack,hashicorp_raft,hashicorp_raft_boltdb \
>-		influxdb:influxdb_usage_client \
>-		jwilder:jwilder_encoding \
>-		kimor79:kimor79_gollectd \
>-		paulbellamy:paulbellamy_ratecounter \
>-		peterh:peterh_liner \
>-		rakyll:rakyll_statik
>+GH_ACCOUNT=	influxdata:DEFAULT
>+GH_TUPLE=	BurntSushi:toml:bbd5bb6:toml \
>+		armon:go-metrics:f303b03:go_metrics \
>+		bmizerany:pat:c068ca2:pat \
>+		boltdb:bolt:831b652:bolt \
>+		dgryski:go-bits:86c69b3:go_bits \
>+		dgryski:go-bitstream:27cd597:go_bitstream \
>+		gogo:protobuf:5b7453b:protobuf \
>+		golang:snappy:5f1c01d:snappy \
>+		hashicorp:go-msgpack:fa3f638:go_msgpack \
>+		hashicorp:raft:57cdb81:raft \
>+		hashicorp:raft-boltdb:d1e82c1:raft_boltdb \
>+		influxdata:usage-client:475977e:usage_client \
>+		jwilder:encoding:07d88d4:encoding \
>+		kimor79:gollectd:b5dddb1:gollectd \
>+		paulbellamy:ratecounter:5a11f58:ratecounter \
>+		peterh:liner:49ca659:liner \
>+		rakyll:statik:2940084:statik \
>+		collectd:go-collectd:9fc824c:go_collectd \
>+ 		golang:crypto:9e7f5dc:crypto \
>+		fatih:pool:cba550e:pool \
> 
>-GH_PROJECT=	bolt:boltdb_bolt \
>-		crypto:golang_crypto \
>-		encoding:jwilder_encoding \
>-		go-bits:dgryski_go_bits \
>-		go-bitstream:dgryski_go_bitstream \
>-		go-collectd:collectd_go_collectd \
>-		go-metrics:armon_go_metrics \
>-		go-msgpack:hashicorp_go_msgpack \
>-		go-spew:davecgh_go_spew \
>-		gollectd:kimor79_gollectd \
>-		liner:peterh_liner \
>-		pat:bmizerany_pat \
>-		pool:fatih_pool \
>-		protobuf:gogo_protobuf \
>-		raft-boltdb:hashicorp_raft_boltdb \
>-		raft:hashicorp_raft \
>-		ratecounter:paulbellamy_ratecounter \
>-		snappy:golang_snappy \
>-		statik:rakyll_statik \
>-		toml:BurntSushi_toml \
>-		usage-client:influxdb_usage_client
> 
>-GH_TAGNAME=	5c4df71:BurntSushi_toml \
>-		345426c:armon_go_metrics \
>-		b8a3500:bmizerany_pat \
>-		2f846c3:boltdb_bolt \
>-		9fc824c:collectd_go_collectd \
>-		5215b55:davecgh_go_spew \
>-		86c69b3:dgryski_go_bits \
>-		27cd597:dgryski_go_bitstream \
>-		cba550e:fatih_pool \
>-		82d16f7:gogo_protobuf \
>-		1f22c01:golang_crypto \
>-		894fd46:golang_snappy \
>-		fa3f638:hashicorp_go_msgpack \
>-		057b893:hashicorp_raft \
>-		d1e82c1:hashicorp_raft_boltdb \
>-		475977e:influxdb_usage_client \
>-		07d88d4:jwilder_encoding \
>-		61d0dee:kimor79_gollectd \
>-		5a11f58:paulbellamy_ratecounter \
>-		ad1edfd:peterh_liner \
>-		274df12:rakyll_statik
>-
> SUB_FILES=	influxd
> SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
> 		INFLUXD_GROUP=${INFLUXD_GROUP} \
>@@ -111,14 +70,12 @@
> 	@${MKDIR} ${WRKSRC}/src/github.com/armon
> 	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
> 	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
>-	@${MKDIR} ${WRKSRC}/src/collectd.org
>-	@${MKDIR} ${WRKSRC}/src/github.com/davecgh
> 	@${MKDIR} ${WRKSRC}/src/github.com/dgryski
> 	@${MKDIR} ${WRKSRC}/src/github.com/gogo
> 	@${MKDIR} ${WRKSRC}/src/github.com/golang
> 	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
>+	@${MKDIR} ${WRKSRC}/src/github.com/influxdata
> 	@${MKDIR} ${WRKSRC}/src/github.com/jwilder
>-	@${MKDIR} ${WRKSRC}/src/github.com/influxdb
> 	@${MKDIR} ${WRKSRC}/src/github.com/kimor79
> 	@${MKDIR} ${WRKSRC}/src/github.com/paulbellamy
> 	@${MKDIR} ${WRKSRC}/src/github.com/peterh
>@@ -126,43 +83,39 @@
> 	@${MKDIR} ${WRKSRC}/src/golang.org/x
> 	@${MKDIR} ${WRKSRC}/src/gopkg.in/fatih
> 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
>-.for src in Dockerfile LICENSE LICENSE_OF_DEPENDENCIES.md Makefile \
>-	build-docker.sh build.py build.sh circle-test.sh circle.yml \
>-	client cluster cmd errors.go etc gobuild.sh importer influxql \
>-	influxvar.go models monitor nightly.sh node.go 	package.sh pkg \
>-	scripts services shared statik stress tcp test.sh tests toml tsdb uuid
>-	@${MV} ${WRKSRC}/${src} \
>-		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
>-.endfor
>-	@${MV} ${WRKSRC_BurntSushi_toml} ${WRKSRC}/src/github.com/BurntSushi/toml
>-	@${MV} ${WRKSRC_boltdb_bolt} ${WRKSRC}/src/github.com/boltdb/bolt
>-	@${MV} ${WRKSRC_davecgh_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew
>-	@${MV} ${WRKSRC_golang_crypto} ${WRKSRC}/src/golang.org/x/crypto
>-	@${MV} ${WRKSRC_golang_snappy} ${WRKSRC}/src/github.com/golang/snappy
>-	@${MV} ${WRKSRC_jwilder_encoding} ${WRKSRC}/src/github.com/jwilder/encoding
>-	@${MV} ${WRKSRC_influxdb_usage_client} ${WRKSRC}/src/github.com/influxdb/usage-client
>-	@${MV} ${WRKSRC_dgryski_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits
>-	@${MV} ${WRKSRC_dgryski_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream
>-	@${MV} ${WRKSRC_collectd_go_collectd}/api ${WRKSRC}/src/collectd.org/api
>-	@${MV} ${WRKSRC_collectd_go_collectd}/cdtime ${WRKSRC}/src/collectd.org/cdtime
>-	@${MV} ${WRKSRC_collectd_go_collectd}/exec ${WRKSRC}/src/collectd.org/exec
>-	@${MV} ${WRKSRC_collectd_go_collectd}/export ${WRKSRC}/src/collectd.org/export
>-	@${MV} ${WRKSRC_collectd_go_collectd}/format ${WRKSRC}/src/collectd.org/format
>-	@${MV} ${WRKSRC_collectd_go_collectd}/network ${WRKSRC}/src/collectd.org/network
>-	@${MV} ${WRKSRC_armon_go_metrics} ${WRKSRC}/src/github.com/armon/go-metrics
>-	@${MV} ${WRKSRC_hashicorp_go_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack
>-	@${MV} ${WRKSRC_hashicorp_raft} ${WRKSRC}/src/github.com/hashicorp/raft
>-	@${MV} ${WRKSRC_hashicorp_raft_boltdb} ${WRKSRC}/src/github.com/hashicorp/raft-boltdb
>-	@${MV} ${WRKSRC_gogo_protobuf} ${WRKSRC}/src/github.com/gogo/protobuf
>-	@${MV} ${WRKSRC_kimor79_gollectd} ${WRKSRC}/src/github.com/kimor79/gollectd
>-	@${MV} ${WRKSRC_peterh_liner} ${WRKSRC}/src/github.com/peterh/liner
>-	@${MV} ${WRKSRC_bmizerany_pat} ${WRKSRC}/src/github.com/bmizerany/pat
>-	@${MV} ${WRKSRC_fatih_pool} ${WRKSRC}/src/gopkg.in/fatih/pool.v2
>-	@${MV} ${WRKSRC_paulbellamy_ratecounter} ${WRKSRC}/src/github.com/paulbellamy/ratecounter
>-	@${MV} ${WRKSRC_rakyll_statik} ${WRKSRC}/src/github.com/rakyll/statik
>+	@cd ${WRKSRC} && \
>+		${MV} CHANGELOG.md CODING_GUIDELINES.md CONTRIBUTING.md DOCKER.md \
>+		Dockerfile Dockerfile_build_ubuntu32 Dockerfile_build_ubuntu64 \
>+		Dockerfile_build_ubuntu64_git Dockerfile_test_ubuntu32 Godeps LICENSE \
>+		LICENSE_OF_DEPENDENCIES.md Makefile QUERIES.md README.md build-docker.sh \
>+		build.py build.sh circle-test.sh circle.yml client cluster \
>+		cmd errors.go etc gobuild.sh importer influxdb.go influxql \
>+		influxvar.go models monitor nightly.sh node.go package.sh pkg scripts \
>+		services stress tcp test.sh tests toml tsdb uuid \
>+ 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
>+	@${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml 
>+	@${MV} ${WRKSRC_go_metrics} ${WRKSRC}/src/github.com/armon/go-metrics 
>+	@${MV} ${WRKSRC_pat} ${WRKSRC}/src/github.com/bmizerany/pat 
>+	@${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt 
>+	@${MV} ${WRKSRC_go_bits} ${WRKSRC}/src/github.com/dgryski/go-bits 
>+	@${MV} ${WRKSRC_go_bitstream} ${WRKSRC}/src/github.com/dgryski/go-bitstream 
>+	@${MV} ${WRKSRC_protobuf} ${WRKSRC}/src/github.com/gogo/protobuf 
>+	@${MV} ${WRKSRC_snappy} ${WRKSRC}/src/github.com/golang/snappy 
>+	@${MV} ${WRKSRC_go_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack 
>+	@${MV} ${WRKSRC_raft} ${WRKSRC}/src/github.com/hashicorp/raft 
>+	@${MV} ${WRKSRC_raft_boltdb} ${WRKSRC}/src/github.com/hashicorp/raft-boltdb 
>+	@${MV} ${WRKSRC_usage_client} ${WRKSRC}/src/github.com/influxdata/usage-client 
>+	@${MV} ${WRKSRC_encoding} ${WRKSRC}/src/github.com/jwilder/encoding 
>+	@${MV} ${WRKSRC_gollectd} ${WRKSRC}/src/github.com/kimor79/gollectd 
>+	@${MV} ${WRKSRC_ratecounter} ${WRKSRC}/src/github.com/paulbellamy/ratecounter 
>+	@${MV} ${WRKSRC_liner} ${WRKSRC}/src/github.com/peterh/liner 
>+	@${MV} ${WRKSRC_statik} ${WRKSRC}/src/github.com/rakyll/statik 
>+	@${MV} ${WRKSRC_go_collectd} ${WRKSRC}/src/collectd.org
>+	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
>+	@${MV} ${WRKSRC_pool} ${WRKSRC}/src/gopkg.in/fatih/pool.v2
> 
> do-build:
>-		@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/ &&  ${SETENV} GOPATH=${WRKSRC} go install ./...
>+		@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} && ${SETENV} GOPATH=${WRKSRC} go install ./...
> 
> do-install:
> 		${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 412367)
>+++ distinfo	(working copy)
>@@ -1,44 +1,42 @@
>-SHA256 (influxdb-influxdb-v0.10.0_GH0.tar.gz) = 42a8410766047955084a25a98da0a914124081c7ab8b3d994e824063b3914f4a
>-SIZE (influxdb-influxdb-v0.10.0_GH0.tar.gz) = 1167832
>-SHA256 (BurntSushi-toml-5c4df71_GH0.tar.gz) = b5456c373ff033e29a7ed86fff52ee0b9a06ec34f9db2c40c4137ffccfafd5eb
>-SIZE (BurntSushi-toml-5c4df71_GH0.tar.gz) = 37094
>-SHA256 (armon-go-metrics-345426c_GH0.tar.gz) = 1a46954fcd70725f4831fda117f68d1e551c3a6ba9c0df8f1021bbc254195d4c
>-SIZE (armon-go-metrics-345426c_GH0.tar.gz) = 13603
>-SHA256 (bmizerany-pat-b8a3500_GH0.tar.gz) = 6468a8b27db2bed1edf6eb845da6f7466221c7b0b41112d77710e4ac76926a2f
>-SIZE (bmizerany-pat-b8a3500_GH0.tar.gz) = 5205
>-SHA256 (boltdb-bolt-2f846c3_GH0.tar.gz) = 0a3f4642d068c28885c46ea6cbd398ebcf3486af2b8fbd19ac3d7f3c8e58f7ed
>-SIZE (boltdb-bolt-2f846c3_GH0.tar.gz) = 78088
>-SHA256 (collectd-go-collectd-9fc824c_GH0.tar.gz) = 4d6f6d88f85e48eff7fa5443145ab62c30463b102dbcc70c3309519b7e01e546
>-SIZE (collectd-go-collectd-9fc824c_GH0.tar.gz) = 24548
>-SHA256 (davecgh-go-spew-5215b55_GH0.tar.gz) = a73d6352d8172dfb648e6aa25a8b81ed5c1895295090c876bef01d017264cbac
>-SIZE (davecgh-go-spew-5215b55_GH0.tar.gz) = 41794
>+SHA256 (influxdata-influxdb-v0.11.1_GH0.tar.gz) = 8c6d404b91ed30763d45af7ed1114b975c8c8e7b4b22e041dd7a2834ddd20017
>+SIZE (influxdata-influxdb-v0.11.1_GH0.tar.gz) = 1198878
>+SHA256 (BurntSushi-toml-bbd5bb6_GH0.tar.gz) = ad48de2a9f53a0065d0be9bf93b40ac3c7b17a0664f25415cdad2d6e08621acf
>+SIZE (BurntSushi-toml-bbd5bb6_GH0.tar.gz) = 38297
>+SHA256 (armon-go-metrics-f303b03_GH0.tar.gz) = 70a38d8118b5969d346c27edd012acc3aaded40cdaedb3c6781da5d51db3d84b
>+SIZE (armon-go-metrics-f303b03_GH0.tar.gz) = 13729
>+SHA256 (bmizerany-pat-c068ca2_GH0.tar.gz) = 1bff463e4313717c5561a97020e5b6ae8095560fa834aa565c488b85b5549433
>+SIZE (bmizerany-pat-c068ca2_GH0.tar.gz) = 6246
>+SHA256 (boltdb-bolt-831b652_GH0.tar.gz) = aae016e4803e38bba0cf3328c07d8d629ac9a655848a0e2bcc7b7f5928a29656
>+SIZE (boltdb-bolt-831b652_GH0.tar.gz) = 79240
> SHA256 (dgryski-go-bits-86c69b3_GH0.tar.gz) = 92e7227b8527dacd387bd89536b8d349e7d57131ead1071329a94133a5e67780
> SIZE (dgryski-go-bits-86c69b3_GH0.tar.gz) = 2137
> SHA256 (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 9bd56e5019d84d31b7ffd68feca5f61db683588c9bb2033763dfc84c99d5c370
> SIZE (dgryski-go-bitstream-27cd597_GH0.tar.gz) = 2801
>-SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
>-SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
>-SHA256 (gogo-protobuf-82d16f7_GH0.tar.gz) = 9080f1109a6a7d41cf70894d756d1787349c27c8805b28ebcf176e8ce9622730
>-SIZE (gogo-protobuf-82d16f7_GH0.tar.gz) = 1640868
>-SHA256 (golang-crypto-1f22c01_GH0.tar.gz) = 28dcb3d3a9249fcc1db0e4829318c8e3c876e584c07bbccd34c18a0b8ee96c1b
>-SIZE (golang-crypto-1f22c01_GH0.tar.gz) = 901862
>-SHA256 (golang-snappy-894fd46_GH0.tar.gz) = c66d0be89fe08f14af8aaffc352b2b620dfd488c6698064644d1e3a8b13c8876
>-SIZE (golang-snappy-894fd46_GH0.tar.gz) = 10119
>+SHA256 (gogo-protobuf-5b7453b_GH0.tar.gz) = 781fa47cb652293ab2d064ede3f047ace34696140a50354469007e06870da970
>+SIZE (gogo-protobuf-5b7453b_GH0.tar.gz) = 1899875
>+SHA256 (golang-snappy-5f1c01d_GH0.tar.gz) = c540a0455edd62cddbcf951854830776c5fc338e66109600db6bc17cb4df72c5
>+SIZE (golang-snappy-5f1c01d_GH0.tar.gz) = 32566
> SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
> SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
>-SHA256 (hashicorp-raft-057b893_GH0.tar.gz) = 01490a9454a0b346d78a7c81b5bb0b0c20c2e52828a7cc23640638e53ad03251
>-SIZE (hashicorp-raft-057b893_GH0.tar.gz) = 60534
>+SHA256 (hashicorp-raft-57cdb81_GH0.tar.gz) = d012a3d85c4a6336044171c49274dbdbf778c90b46ffa65507eeb6dd70dcaf2b
>+SIZE (hashicorp-raft-57cdb81_GH0.tar.gz) = 66030
> SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
> SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
>-SHA256 (influxdb-usage-client-475977e_GH0.tar.gz) = b62bc789b1e508b3904a9514705d0d5c362e9788028eeab97c588927a94d59f7
>-SIZE (influxdb-usage-client-475977e_GH0.tar.gz) = 6620
>+SHA256 (influxdata-usage-client-475977e_GH0.tar.gz) = b62bc789b1e508b3904a9514705d0d5c362e9788028eeab97c588927a94d59f7
>+SIZE (influxdata-usage-client-475977e_GH0.tar.gz) = 6620
> SHA256 (jwilder-encoding-07d88d4_GH0.tar.gz) = c061d88b954e13a5c1c74b964e9b56c9a670f3f3ec8c8f563827f5323b8e2ae7
> SIZE (jwilder-encoding-07d88d4_GH0.tar.gz) = 9462
>-SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498
>-SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508
>+SHA256 (kimor79-gollectd-b5dddb1_GH0.tar.gz) = b97efdb5777d10a193a2de81048798dd5ab9e9626fe8af2accc56c0d4907d84d
>+SIZE (kimor79-gollectd-b5dddb1_GH0.tar.gz) = 9589
> SHA256 (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = e493c6c8d673ecda63e9c0bd4e63a5af11362878c0c95f0e46711ccad1462eba
> SIZE (paulbellamy-ratecounter-5a11f58_GH0.tar.gz) = 2877
>-SHA256 (peterh-liner-ad1edfd_GH0.tar.gz) = 8cafe3e527eebcb6858c76e7abe532f6faf941266b7f37dee9373956956409fd
>-SIZE (peterh-liner-ad1edfd_GH0.tar.gz) = 18803
>-SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49
>-SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898
>+SHA256 (peterh-liner-49ca659_GH0.tar.gz) = 0725f2acb6bdda937b9e4a93654811a75b5bdb966714b55e7244876970800f95
>+SIZE (peterh-liner-49ca659_GH0.tar.gz) = 19257
>+SHA256 (rakyll-statik-2940084_GH0.tar.gz) = 4ac0ba6d281986dadc60b85bc8a72a824c297db13ca5f5d9b75e405c9e26a6bc
>+SIZE (rakyll-statik-2940084_GH0.tar.gz) = 77894
>+SHA256 (collectd-go-collectd-9fc824c_GH0.tar.gz) = 4d6f6d88f85e48eff7fa5443145ab62c30463b102dbcc70c3309519b7e01e546
>+SIZE (collectd-go-collectd-9fc824c_GH0.tar.gz) = 24548
>+SHA256 (golang-crypto-9e7f5dc_GH0.tar.gz) = fc7f1f1224e6275a72c49096b211ef670bab040b93120c17ed66967fce9ee2d3
>+SIZE (golang-crypto-9e7f5dc_GH0.tar.gz) = 904025
>+SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
>+SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854

Actions: View | Diff

Attachments on bug 207400: 168885 | 168886 | 168954 | 169180 | 169183 | 169184 | 169186