Jesse McConnell
|
2bcc21350c
|
Updating VERSION.txt top section
|
2013-02-21 10:02:04 -06:00 |
Joakim Erdfelt
|
253aef11f8
|
Updating VERSION.txt top section
|
2013-02-01 10:09:19 -07:00 |
|
Joakim Erdfelt
|
bd6cf83057
|
Rolling back VERSION.txt
|
2013-02-01 09:45:10 -07:00 |
|
Joakim Erdfelt
|
c075edd4c5
|
Merge branch 'master' into release-9
|
2013-02-01 09:44:03 -07:00 |
Greg Wilkins
|
626f10678c
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
VERSION.txt
aggregates/jetty-all/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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nosql/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-policy/pom.xml
jetty-proxy/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-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-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-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-02-01 22:15:44 +11:00 |
|
Greg Wilkins
|
e8de7bd905
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-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-webapp-rfc2616/pom.xml
|
2013-02-01 18:22:04 +11:00 |
|
Jesse McConnell
|
678e038bfb
|
set for release
|
2013-01-31 13:46:59 -06:00 |
|
Jesse McConnell
|
1101aec2d1
|
set for dev
|
2013-01-31 13:20:34 -06:00 |
|
Jesse McConnell
|
0a1fbc7ea0
|
set for release
|
2013-01-31 11:08:08 -06:00 |
|
Jesse McConnell
|
81d3c76780
|
prep for dev
|
2013-01-31 10:41:05 -06:00 |
|
Jesse McConnell
|
ade2e15318
|
Set for release
|
2013-01-31 08:03:42 -06:00 |
|
Jesse McConnell
|
2e2c07dad9
|
Set for release
|
2013-01-31 08:02:54 -06:00 |
|
Jesse McConnell
|
fcdc53f883
|
prep for dev
|
2013-01-20 11:03:31 -06:00 |
|
Jesse McConnell
|
5d394859c5
|
set for release
|
2013-01-19 19:06:19 -06:00 |
|
Jesse McConnell
|
38319f4cb6
|
set for release
|
2013-01-18 10:49:25 -06:00 |
|
Joakim Erdfelt
|
3f5b182631
|
Updating VERSION.txt top section
|
2012-12-26 14:34:00 -07:00 |
|
Joakim Erdfelt
|
2bd3108657
|
Updating VERSION.txt top section
|
2012-12-26 12:29:38 -07:00 |
|
Joakim Erdfelt
|
b15268763d
|
Updating VERSION.txt top section
|
2012-12-21 10:43:20 -07:00 |
|
Jesse McConnell
|
e30e307367
|
test
|
2012-12-12 14:56:05 -06:00 |
|
Jesse McConnell
|
675d0c23ce
|
test
|
2012-12-12 14:55:33 -06:00 |
Hugues Malphettes
|
e999c45bad
|
394294 Start web-bundles started before jetty
A web-bundle started before jetty-osgi should be deployed
as a webapp when jetty-osgi starts.
Thanks to Constantine Nosovsky for the patch.
|
2012-11-23 18:29:07 +08:00 |
|
Jesse McConnell
|
e21df17ad6
|
set for dev
|
2012-11-20 12:10:05 -06:00 |
|
Jesse McConnell
|
3a44196efd
|
set for release
|
2012-11-20 11:07:55 -06:00 |
|
Jesse McConnell
|
db76d8775a
|
reset for release
|
2012-11-20 09:49:47 -06:00 |
|
Jesse McConnell
|
aa1dcdbc6d
|
set for dev
|
2012-11-19 19:05:00 -06:00 |
|
Jesse McConnell
|
e6b25b82ea
|
set release version.txt
|
2012-11-19 17:43:55 -06:00 |
|
Greg Wilkins
|
f336511f87
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
VERSION.txt
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
|
2012-11-08 14:58:10 +11:00 |
|
Greg Wilkins
|
b3274a6baa
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
VERSION.txt
|
2012-11-08 14:41:01 +11:00 |
|
Jesse McConnell
|
d0819605af
|
set for dev
|
2012-11-06 12:01:06 -06:00 |
|
Jesse McConnell
|
edf898bdd1
|
set for dev
|
2012-11-06 09:00:48 -06:00 |
|
Jesse McConnell
|
a08536c8bc
|
set for dev
|
2012-11-06 08:18:06 -06:00 |
|
Jesse McConnell
|
32d0f950a9
|
set for dev
|
2012-11-06 08:15:05 -06:00 |
|
Jesse McConnell
|
6fc39fc781
|
set for release
|
2012-11-06 07:45:17 -06:00 |
|
Jesse McConnell
|
ec2fb110f1
|
reset
|
2012-11-06 07:44:12 -06:00 |
|
Jesse McConnell
|
7fadb8548b
|
set for release
|
2012-11-06 07:41:59 -06:00 |
|
Jesse McConnell
|
581779a9df
|
reset
|
2012-11-06 07:37:07 -06:00 |
Jan Bartel
|
6b04056371
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-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-webapp-rfc2616/pom.xml
|
2012-11-06 16:12:00 +11:00 |
|
Jesse McConnell
|
9bf7d89190
|
set for dev
|
2012-11-05 14:39:50 -06:00 |
|
Jesse McConnell
|
c74a56582a
|
set for dev
|
2012-11-05 13:24:43 -06:00 |
|
Jesse McConnell
|
063efdc484
|
Updating VERSION.txt top section
|
2012-11-05 11:57:40 -06:00 |
|
Jesse McConnell
|
d3565e8610
|
Updating VERSION.txt top section
|
2012-11-05 11:55:10 -06:00 |
|
Jesse McConnell
|
92e2ad44fc
|
Updating VERSION.txt top section
|
2012-11-05 11:45:59 -06:00 |
|
Joakim Erdfelt
|
c388d0e586
|
VERSION.txt cleanup + issue refresh of 9.0.0.M1
|
2012-10-16 12:19:22 -07:00 |
|
Jesse McConnell
|
cd8f940bab
|
set for dev
|
2012-10-15 15:08:27 -05:00 |
|
Jesse McConnell
|
82316d886d
|
Updating VERSION.txt top section
|
2012-10-15 12:36:44 -05:00 |
|
Jesse McConnell
|
b3ee687eda
|
set for m0
|
2012-09-21 12:58:34 -05:00 |
|
Jesse McConnell
|
73d04ca247
|
set for release of milestone
|
2012-09-20 13:55:42 -05:00 |
|
Jesse McConnell
|
c7f8bdfee8
|
prep for dev
|
2012-09-10 16:10:42 -05:00 |
|
Jesse McConnell
|
ff2b988eff
|
prep for dev
|
2012-09-10 15:40:04 -05:00 |
|
Jesse McConnell
|
0c3f1b6ab1
|
prep for release
|
2012-09-10 13:15:40 -05:00 |
|
Jesse McConnell
|
4180d7e1f5
|
prepare for release
|
2012-09-10 12:59:04 -05:00 |
|
Jesse McConnell
|
83781bce8d
|
prepare for release
|
2012-09-10 12:57:18 -05:00 |
|
Jesse McConnell
|
33ce6e6787
|
prep for dev
|
2012-09-03 16:23:44 -05:00 |
|
Jesse McConnell
|
fb929aca20
|
prep for dev
|
2012-09-03 14:32:38 -05:00 |
|
Jesse McConnell
|
ff57f913e8
|
Updating VERSION.txt top section
|
2012-09-03 12:53:24 -05:00 |
|
Jesse McConnell
|
1587c3e8c5
|
Updating VERSION.txt top section
|
2012-09-03 12:49:16 -05:00 |
Thomas Becker
|
369bc035fc
|
jetty-9: jetty-spdy refactored to match jetty-9.
|
2012-07-27 16:18:47 +02:00 |
|
Jan Bartel
|
cdbec2c78b
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-07-26 19:05:51 +10:00 |
|
Thomas Becker
|
688eec732f
|
version.txt update
|
2012-07-25 20:20:17 +02:00 |
|
Jesse McConnell
|
3530da5515
|
reset for dev
|
2012-07-17 10:39:28 -05:00 |
|
Jesse McConnell
|
db2118df4a
|
reset for dev
|
2012-07-17 10:38:35 -05:00 |
|
Jesse McConnell
|
88922d3dc9
|
set for release
|
2012-07-16 12:58:26 -05:00 |
|
Jesse McConnell
|
5e8165e2db
|
set for release
|
2012-07-16 12:58:15 -05:00 |
|
Jesse McConnell
|
e082da1ce0
|
reset for release
|
2012-07-16 12:55:44 -05:00 |
|
Jesse McConnell
|
f59b2a0632
|
reset release
|
2012-07-16 12:54:36 -05:00 |
|
Jesse McConnell
|
957d39da17
|
merge master
|
2012-07-16 12:51:18 -05:00 |
|
Jesse McConnell
|
fc7c186cbf
|
reset for dev
|
2012-07-13 12:25:39 -05:00 |
|
Jesse McConnell
|
9353ef6461
|
reset for dev
|
2012-07-13 12:24:20 -05:00 |
|
Jesse McConnell
|
0d74198345
|
Updating VERSION.txt top section
|
2012-07-13 09:07:51 -05:00 |
|
Jesse McConnell
|
bcd2d66907
|
Updating VERSION.txt top section
|
2012-07-13 09:07:50 -05:00 |
|
Jesse McConnell
|
f7f0a5b22b
|
reset for dev
|
2012-05-24 18:01:08 -05:00 |
|
Jesse McConnell
|
2a4b7f49a1
|
reset for dev
|
2012-05-24 16:39:28 -05:00 |
|
Jesse McConnell
|
d0a92ebb54
|
Updating VERSION.txt top section
|
2012-05-24 09:02:07 -05:00 |
|
Jesse McConnell
|
aa7e1b699e
|
Updating VERSION.txt top section
|
2012-05-24 09:02:05 -05:00 |
|
Jesse McConnell
|
c7a9adaa32
|
reset for release
|
2012-05-24 08:33:44 -05:00 |
|
Jesse McConnell
|
c8fe38733f
|
reset versions for release
|
2012-05-24 08:30:26 -05:00 |
|
Jesse McConnell
|
b51f521772
|
set for dev
|
2012-05-22 16:49:20 -05:00 |
|
Jesse McConnell
|
1eb73bae2d
|
set for dev
|
2012-05-22 16:48:40 -05:00 |
|
Jesse McConnell
|
54d1ff7a19
|
Updating VERSION.txt top section
|
2012-05-22 11:54:50 -05:00 |
|
Jesse McConnell
|
a2ed87a046
|
Updating VERSION.txt top section
|
2012-05-22 11:52:59 -05:00 |
|
Jesse McConnell
|
fcf7a081ce
|
prep for dev
|
2012-04-16 12:54:29 -05:00 |
|
Jesse McConnell
|
582f92aa21
|
prep for dev
|
2012-04-16 12:53:30 -05:00 |
|
Jesse McConnell
|
1aba5dd41b
|
Updating VERSION.txt top section
|
2012-04-16 09:11:31 -05:00 |
|
Jesse McConnell
|
ff29659869
|
Updating VERSION.txt top section
|
2012-04-16 09:11:00 -05:00 |
|
Jesse McConnell
|
461282a573
|
Updating VERSION.txt top section
|
2012-04-16 09:10:25 -05:00 |
Simone Bordet
|
45b2c3b1b5
|
Merged from master after fixing typo in jetty-spdy.xml.
|
2012-04-16 15:55:49 +02:00 |
|
Jesse McConnell
|
9c4a58200b
|
prep for dev
|
2012-04-13 18:28:51 -05:00 |
|
Jesse McConnell
|
443fbdfe7d
|
set for dev
|
2012-04-13 17:09:34 -05:00 |
|
Jesse McConnell
|
71b3f75a90
|
Updating VERSION.txt top section
|
2012-04-13 15:05:26 -05:00 |
|
Jesse McConnell
|
193b0d6497
|
Updating VERSION.txt top section
|
2012-04-13 15:03:22 -05:00 |
|
Jesse McConnell
|
4f7c896b3d
|
merge from master
|
2012-04-13 14:10:30 -05:00 |
|
Jesse McConnell
|
f8b5c0040d
|
reset for release
|
2012-04-13 14:09:06 -05:00 |
|
Simone Bordet
|
72040202d4
|
Reverted release back to 8.1.3-SNAPSHOT.
|
2012-04-13 17:27:37 +02:00 |
|
Simone Bordet
|
85710fb9ea
|
Reverted release back to 7.6.3-SNAPSHOT.
|
2012-04-13 16:59:06 +02:00 |
|
Jesse McConnell
|
92c6b5338b
|
Updating VERSION.txt top section
|
2012-04-12 11:26:08 -05:00 |
|
Jesse McConnell
|
a164adc48e
|
Updating VERSION.txt top section
|
2012-04-12 10:38:19 -05:00 |
|
Jesse McConnell
|
7078716df4
|
Updating VERSION.txt top section
|
2012-04-12 10:01:24 -05:00 |
|
Jesse McConnell
|
7f06c73d6f
|
Updating VERSION.txt top section
|
2012-04-12 09:16:35 -05:00 |
|
Jesse McConnell
|
200d9b5de0
|
reset for dev
|
2012-03-09 00:42:24 -06:00 |
|
Jesse McConnell
|
3561bcbf40
|
set for dev
|
2012-03-08 21:53:24 -06:00 |