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
|
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 |
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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
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 |