Joakim Erdfelt
8a12915dac
Fixing surefire random run definition
2016-07-06 11:26:54 -07:00
Jesse McConnell
399c5beb04
merge from 9.3.x
2016-06-22 15:23:51 -05:00
Jesse McConnell
ae931538ab
[maven-release-plugin] prepare for next development iteration
2016-06-22 13:59:10 -05:00
Jesse McConnell
df1ed4fb03
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 13:59:06 -05:00
Jesse McConnell
030ec61837
[maven-release-plugin] prepare for next development iteration
2016-06-22 09:14:25 -05:00
Jesse McConnell
9a4cb41122
[maven-release-plugin] prepare release jetty-9.3.11.M0
2016-06-22 09:14:21 -05:00
Jesse McConnell
e7034117ea
[maven-release-plugin] prepare for next development iteration
2016-06-21 08:50:13 -05:00
Jesse McConnell
16c435c69d
[maven-release-plugin] prepare release jetty-9.3.10.v20160621
2016-06-21 08:50:09 -05:00
Jesse McConnell
34e92ec59e
update jetty version plugin
2016-06-21 08:18:05 -05:00
Joakim Erdfelt
abdbd177c1
Wrong version plugin (oops)
2016-06-20 09:12:05 -07:00
Joakim Erdfelt
7b1d807e49
Updating version plugin
2016-06-20 09:10:27 -07:00
Jan Bartel
5093df33dc
Issue #505
...
Updated to asm 5.1.
2016-06-15 18:20:32 +10:00
Jesse McConnell
64ed45389b
Issue 589 creation of jetty-home and leveraging it in jetty-distribution
2016-06-07 15:42:10 -05:00
Simone Bordet
73fe6715de
Issue #306 - Merge jetty-parent into jetty-project.
...
Moved more plugin version declarations into jetty.project's pom.
2016-06-07 10:23:38 +02:00
Simone Bordet
a8f25b550f
Fixes #487 - JDK 9 build compatibility.
...
Fixes #306 - Merge jetty-parent into jetty-project.
- Removed jetty.parent dependency, moving all relevant sections to
jetty.project's pom.xml.
- Introduced profiles for JDK 8 only modules and configuration, and
for JDK 9 only modules and configurations.
- Major cleanup of pom.xml files.
- All Maven Plugin now declared in alphabetical order in
pluginManagement section of jetty.project's pom.xml.
2016-06-06 21:28:51 +02:00
Jan Bartel
d6689ce803
Add memcached option for session data caching
2016-05-27 16:43:46 +10:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Jesse McConnell
d5c6793e6a
[maven-release-plugin] prepare for next development iteration
2016-05-17 15:33:46 -05:00
Jesse McConnell
0bab7e6616
[maven-release-plugin] prepare release jetty-9.2.17.v20160517
2016-05-17 15:33:42 -05:00
Joakim Erdfelt
86bf31aad7
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-05-03 11:36:25 -07:00
Jesse McConnell
8fd446040b
documentation build in default reactor
2016-05-03 07:29:17 -05:00
Jesse McConnell
48ff4ad07c
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-04-29 14:27:56 -05:00
Jesse McConnell
bc5ab11417
wire documentation into build
2016-04-29 11:29:23 -05:00
Joakim Erdfelt
a1eab9d9a4
Fixing version
2016-04-26 16:16:32 -07:00
Joakim Erdfelt
8cc041bb04
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-25 12:00:45 -07:00
Joakim Erdfelt
66a70adb98
Merge branch 'release-9.2.16' into jetty-9.2.x
2016-04-25 11:34:07 -07:00
Simone Bordet
64a8d8819f
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-20 14:29:38 +02:00
Simone Bordet
89efdb3e09
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-04-20 14:29:11 +02:00
Simone Bordet
c90f60bd9c
Updated ALPN version for JDK 8u91 and 8u92.
2016-04-20 14:26:17 +02:00
Simone Bordet
b3fa4abaa0
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-14 23:45:48 +02:00
Joakim Erdfelt
2fa7d3fa37
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-04-14 14:36:02 -07:00
Joakim Erdfelt
939505c342
Updating to version 9.2.17-SNAPSHOT
2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d
Updating to version 9.2.16.v20160414
2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d
Revert "Updating to version 9.2.16.v20160414"
...
This reverts commit 29ae63855b
.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b
Updating to version 9.2.16.v20160414
2016-04-14 13:17:21 -07:00
Joakim Erdfelt
b402524401
Bumping up jetty-version-maven-plugin rev
2016-04-14 12:11:07 -07:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Jesse McConnell
d8a6bed74a
set proper scm info
2016-04-07 10:43:12 -05:00
Simone Bordet
5aef3ba3e4
Merged branch 'jetty-9.3.x' into 'master'.
2016-04-04 15:41:04 +02:00
Simone Bordet
c1997b40a5
Updated ALPN to OpenJDK 8u77.
2016-04-04 15:38:53 +02:00
Simone Bordet
3e6bc4d17a
Updated ALPN version for JDK 8u77.
2016-04-04 10:58:09 +02:00
Jan Bartel
77a6514063
Issue #469 Update to Apache Jasper 8.0.33
2016-03-31 18:43:50 +11:00
Jan Bartel
60bccc178e
Issue #469 update to apache jasper 8.0.33
2016-03-31 18:41:03 +11:00
Jan Bartel
185ca3baa1
Issue #469 Update to Apache Jasper 8.0.33
2016-03-31 18:22:49 +11:00
Joakim Erdfelt
4ca7673c3f
api-change profile now works with master
...
+ Adding script to collect all clirr:clirr into single html report
2016-03-24 15:56:32 -07:00
Joakim Erdfelt
6853aa5080
Marking 9.3.8 as clirr comparison
2016-03-23 20:41:19 -07:00
Jan Bartel
8eb240c2be
Issue #371 update apache jsp to 8.0.27
2016-03-15 12:41:26 +11:00
Joakim Erdfelt
c68d3b1d8d
Updating to version 9.3.9-SNAPSHOT
2016-03-14 09:07:52 -07:00
Joakim Erdfelt
1f3b3f31f4
Updating to version 9.3.8.v20160314
2016-03-14 08:30:20 -07:00
Simone Bordet
02190278f1
Merged branch 'jetty-9.3.x' into 'master'.
2016-03-11 22:49:49 +01:00
Joakim Erdfelt
01aded0eaa
Bumping up version jetty-version-maven-plugin to 1.1
2016-03-11 08:41:37 -07:00
Joakim Erdfelt
da6be3ed7a
Fixing javadoc
2016-03-07 10:24:57 -07:00
Greg Wilkins
17d1beeec8
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-15 12:34:15 +01:00
Greg Wilkins
98607e2abf
487158 Switched SCM URIs to github
2016-02-15 12:26:42 +01:00
Joakim Erdfelt
f98dde5e5b
Updating to version 9.2.16-SNAPSHOT
2016-02-10 15:36:41 -07:00
Joakim Erdfelt
9b6890d3c1
Updating to version 9.2.15.v20160210
2016-02-10 14:49:12 -07:00
Simone Bordet
281313440b
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-08 15:57:40 +01:00
Simone Bordet
1ed327ecce
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-08 15:56:53 +01:00
Simone Bordet
e853632c22
Updated ALPN version for JDK 8u73 and 8u74.
2016-02-08 15:52:03 +01:00
Simone Bordet
56c0bc768c
Merged branch 'jetty9.3.x' into 'master'.
2016-01-21 17:52:37 +01:00
Simone Bordet
7703784cab
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-21 17:32:14 +01:00
Simone Bordet
35bc923f50
Updated ALPN version for JDK 8u71 and 8u72.
2016-01-21 17:25:48 +01:00
Joakim Erdfelt
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
Joakim Erdfelt
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
Joakim Erdfelt
b7f9c9aca9
Updating to version 9.3.7-SNAPSHOT
2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690
Updating to version 9.3.7.RC1
2016-01-13 07:30:24 -07:00
Joakim Erdfelt
c62b42ffb3
485199 - Remove copyright blurb from pom.xml files
2016-01-08 11:28:57 -07:00
Jan Bartel
b47990189c
484616 Outdated version of javaee_web_services_client_1_2.xsd
2016-01-06 13:35:32 +11:00
Jan Bartel
d760926554
484616 Outdated version of javaee_web_services_client_1_2.xsd
2016-01-06 13:34:46 +11:00
Simone Bordet
6128bd6d45
Merged branch 'jetty-9.3.x' into 'master'.
2016-01-05 11:50:52 +01:00
Simone Bordet
f519aa28fb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-05 11:40:57 +01:00
Simone Bordet
50100ca86d
Fixed copyright blurbs.
2016-01-05 11:30:38 +01:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Joakim Erdfelt
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
Greg Wilkins
7843b7348e
480827 Implemented Unix Domain Socket Connector
...
Squashed commit of the following:
commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 6 10:44:00 2015 +1100
Merge branch 'master' into unix-socket
commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 18:41:25 2015 +1100
Merge branch 'master' into unix-socket
commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:38:27 2015 +1100
Merge branch 'master' into unix-socket
commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Nov 5 17:24:48 2015 +1100
Unix socket configuration
commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Nov 4 15:13:40 2015 +1100
Merge branch 'master' into unix-socket
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java
commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Nov 2 12:21:19 2015 +1100
Merge branch 'master' into unix-socket
commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 15:42:58 2015 +1100
local connectors report NOIP address
commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 12:11:13 2015 +1100
Gentler ssl close test
commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 11:09:42 2015 +1100
Merge branch 'master' into unix-socket
commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 30 08:34:30 2015 +1100
SecureRequestCustomizer for UnixSockets
commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:47:05 2015 +1100
Merge branch 'master' into unix-socket
commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 19:31:50 2015 +1100
use proxy connection
commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 29 16:46:29 2015 +1100
Merge branch 'master' into unix-socket
commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:58:25 2015 +1100
fixed config
commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Oct 28 15:34:28 2015 +1100
Merge branch 'master' into unix-socket
commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Oct 26 13:04:34 2015 +1100
Merge branch 'master' into unix-socket
commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 15:24:19 2015 +1100
Async accepting
commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 14:45:35 2015 +1100
set acceptors
commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:44:54 2015 +1100
licence
commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 11:24:14 2015 +1100
unixsocket work in progress adding modules
commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:52:01 2015 +1100
Merge branch 'master' into unix-socket
commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Oct 23 08:49:52 2015 +1100
IP headers
commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 23:48:57 2015 +1100
working with haproxy
commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 18:25:09 2015 +1100
unixsocket working
commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Oct 22 15:39:55 2015 +1100
work in progress
2015-11-06 11:17:46 +11:00
Simone Bordet
700975fe41
Merged branch 'jetty-9.3.x' into 'master'.
2015-11-05 12:17:30 +01:00
Simone Bordet
50e565bac0
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-11-05 12:14:28 +01:00
Simone Bordet
b4cf2921c8
Updated ALPN version for JDK 8u65 and 8u66.
2015-11-05 12:05:08 +01:00
Jan Bartel
b3b48924d5
Update build profile for jdk1.8.0.66
2015-11-02 12:42:22 +11:00
Jan Bartel
8b27484ea2
Update build profile for jdk1.8.0.66
2015-10-28 13:50:34 +11:00
Joakim Erdfelt
87cc795e88
Bumping up surefire plugin version
...
+ This should address the CI build JVM hang bug if we have a
bad/failing testcase (like the recent jetty-proxy issues)
+ See bug https://issues.apache.org/jira/browse/SUREFIRE-524
2015-10-23 11:31:06 -07:00
Jan Bartel
43a28a5080
480272 Update to newer jdt ecj version
2015-10-21 15:26:26 +11:00
Jan Bartel
781a380fbd
480272 Update to newer jdt ecj version
2015-10-21 15:25:24 +11:00
Joakim Erdfelt
4dfd68b315
Merge branch 'jetty-9.3.x'
...
Conflicts:
aggregates/jetty-all-compact3/pom.xml
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/cdi-core/pom.xml
jetty-cdi/cdi-full-servlet/pom.xml
jetty-cdi/cdi-servlet/pom.xml
jetty-cdi/cdi-websocket/pom.xml
jetty-cdi/pom.xml
jetty-cdi/test-cdi-webapp/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http2/http2-alpn-tests/pom.xml
jetty-http2/http2-client/pom.xml
jetty-http2/http2-common/pom.xml
jetty-http2/http2-hpack/pom.xml
jetty-http2/http2-http-client-transport/pom.xml
jetty-http2/http2-server/pom.xml
jetty-http2/pom.xml
jetty-infinispan/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-http-client-transport/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-infinispan-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-10-13 08:53:35 -07:00
Joakim Erdfelt
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
Jan Bartel
73de40921c
Merge branch 'jetty-9.3.x' into gcloud-session-manager
2015-10-13 08:35:50 +11:00
Joakim Erdfelt
06593a546c
Using 8.0.27 release
2015-10-12 13:15:19 -07:00
Joakim Erdfelt
dcc3ad3f22
Bumping up apache-jsp to 8.0.27-SNAPSHOT
2015-10-09 10:14:49 -07:00
Joakim Erdfelt
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
Joakim Erdfelt
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
Joakim Erdfelt
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
Jan Bartel
022f8e66f6
Merge branch 'master' into gcloud-session-manager
2015-10-07 12:13:00 +11:00