From cd28f169066b928ed3933de1fe901a187794d4ff Mon Sep 17 00:00:00 2001 From: Richard Scothern Date: Thu, 4 Feb 2016 10:58:06 -0800 Subject: [PATCH 1/2] update version file Signed-off-by: Richard Scothern --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index 450d15c2..a46d1b0c 100644 --- a/version/version.go +++ b/version/version.go @@ -8,4 +8,4 @@ var Package = "github.com/docker/distribution" // the latest release tag by hand, always suffixed by "+unknown". During // build, it will be replaced by the actual version. The value here will be // used if the registry is run after a go get based install. -var Version = "v2.1.0+unknown" +var Version = "v2.3.0+unknown" From 099622876197e3b24d627a72053d1bcc8968076a Mon Sep 17 00:00:00 2001 From: Richard Scothern Date: Thu, 4 Feb 2016 10:36:15 -0800 Subject: [PATCH 2/2] Update maintainers and authors Signed-off-by: Richard Scothern --- .mailmap | 3 ++- AUTHORS | 9 +++++++++ MAINTAINERS | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 191e60cd..e4e50ee7 100644 --- a/.mailmap +++ b/.mailmap @@ -2,6 +2,7 @@ Stephen J Day Stephen Day Stephen Day Olivier Gambier Olivier Gambier Brian Bland Brian Bland +Brian Bland Brian Bland Josh Hawn Josh Hawn Richard Scothern Richard Richard Scothern Richard Scothern @@ -11,4 +12,4 @@ Jessie Frazelle Sharif Nassar Sharif Nassar Sven Dowideit Sven Dowideit Vincent Giersch Vincent Giersch -davidli davidli \ No newline at end of file +davidli davidli diff --git a/AUTHORS b/AUTHORS index 4b97cd78..a44266b0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,6 +21,7 @@ Ben Firshman bin liu Brian Bland burnettk +Carson A Chris Dillon Daisuke Fujita Darren Shepherd @@ -33,11 +34,13 @@ davidli Dejan Golja Derek McGowan Diogo Mónica +DJ Enriquez Donald Huang Doug Davis farmerworking Florentin Raud Frederick F. Kautz IV +gabriell nascimento harche Henri Gomez Hu Keping @@ -55,7 +58,9 @@ Josh Hawn Julien Fernandez Kelsey Hightower Kenneth Lim +Kenny Leung Li Yi +Liu Hua Louis Kottmann Luke Carpenter Mary Anthony @@ -76,7 +81,9 @@ Olivier Jacques Patrick Devine Philip Misiowiec Richard Scothern +Rodolfo Carvalho Rusty Conover +Sean Boran Sebastiaan van Stijn Sharif Nassar Shawn Falkner-Horine @@ -93,11 +100,13 @@ Thomas Sjögren Tianon Gravi Tibor Vass Tonis Tiigi +Trevor Pounds Troels Thomsen Vincent Batts Vincent Demeester Vincent Giersch W. Trevor King +weiyuan.yl xg.song xiekeyang Yann ROBERT diff --git a/MAINTAINERS b/MAINTAINERS index bda40015..97f415db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -32,6 +32,11 @@ Email = "aaron.lehmann@docker.com" GitHub = "aaronlehmann" + [people.brianbland] + Name = "Brian Bland" + Email = "brian.bland@docker.com" + GitHub = "BrianBland" + [people.dmcgowan] Name = "Derek McGowan" Email = "derek@mcgstyle.net"