Jesse McConnell
|
7cb15929f7
|
Merge branch 'master' into jetty-8
|
2012-01-17 13:37:28 -06:00 |
Jesse McConnell
|
90184ab3c3
|
Latest merge from master
|
2012-01-17 13:36:44 -06:00 |
Joakim Erdfelt
|
6da9a22c09
|
Minor update to VERSION.txt format
|
2012-01-17 11:21:18 -07:00 |
Jesse McConnell
|
593af6a226
|
update version
|
2012-01-13 12:25:01 -06:00 |
Jesse McConnell
|
38fa2d00d4
|
Updating VERSION.txt top section
|
2012-01-13 11:21:37 -06:00 |
Jesse McConnell
|
2eb1b3c3c4
|
Updating VERSION.txt top section
|
2012-01-13 09:20:05 -06:00 |
Jesse McConnell
|
60682d4b62
|
Updating VERSION.txt top section
|
2012-01-13 08:14:16 -06:00 |
Jan Bartel
|
1fbec51c8a
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2012-01-10 16:08:59 +11:00 |
Joakim Erdfelt
|
505a76df05
|
Updating VERSION.txt top section
|
2012-01-05 10:54:42 -07:00 |
Joakim Erdfelt
|
bbe48ddfbb
|
Updating version jetty-7.6.0.RC3 in VERSION.txt
|
2012-01-05 09:26:44 -07:00 |
hmalphettes
|
4f8cff8ccd
|
bug 367548 the nested package must not be imported twice in jetty-osgi-boot
|
2011-12-27 07:59:13 +08:00 |
Jesse McConnell
|
ed46b71f37
|
Merge branch 'master' into jetty-8
|
2011-12-23 07:44:29 -06:00 |
Jesse McConnell
|
30bd9ee000
|
update version
|
2011-12-22 16:54:19 -06:00 |
Jesse McConnell
|
64b42a1f0c
|
updating version.txt
|
2011-12-22 14:40:32 -06:00 |
Jesse McConnell
|
d7ba9772f6
|
Updating VERSION.txt top section
|
2011-12-22 12:56:08 -06:00 |
Jesse McConnell
|
06882e3c56
|
Updating VERSION.txt top section
|
2011-12-22 12:51:44 -06:00 |
hmalphettes
|
49556c0f40
|
bug 359329. missing import/export in jetty-plus jetty-jaspi
|
2011-12-09 16:52:58 +08:00 |
Jesse McConnell
|
c6d5d1713c
|
update version
|
2011-12-06 16:31:03 -06:00 |
Jesse McConnell
|
f188ea4c0f
|
Updating VERSION.txt top section
|
2011-12-06 15:15:56 -06:00 |
Jan Bartel
|
0363b8100f
|
Merge remote-tracking branch 'origin/master' into jetty-8
|
2011-12-05 15:24:22 +11:00 |
Jesse McConnell
|
8ef68e1e0e
|
Updating VERSION.txt top section
|
2011-12-04 15:33:07 -06:00 |
Jesse McConnell
|
56cd2df556
|
Updating VERSION.txt top section
|
2011-12-04 12:11:35 -06:00 |
hmalphettes
|
89afbdf31d
|
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
|
2011-12-02 17:27:26 +08:00 |
Greg Wilkins
|
24ccaec3da
|
Updating VERSION.txt top section
|
2011-11-30 15:50:25 +11:00 |
Greg Wilkins
|
46c10b2b8a
|
Updating VERSION.txt top section
|
2011-11-30 12:46:36 +11:00 |
Greg Wilkins
|
dc92728c00
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
|
2011-11-30 12:21:02 +11:00 |
Greg Wilkins
|
0b066d3d8e
|
Updating VERSION.txt top section
|
2011-11-30 07:29:32 +11:00 |
Greg Wilkins
|
a47e07445a
|
Upating VERSION.txt top section
|
2011-11-29 13:08:26 +11:00 |
Greg Wilkins
|
f3b2289527
|
release version
|
2011-11-29 13:06:05 +11:00 |
Greg Wilkins
|
55d5020980
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
|
2011-11-29 09:06:25 +11:00 |
Greg Wilkins
|
11a79f7dee
|
check nonce count
|
2011-11-28 12:06:43 +11:00 |
Greg Wilkins
|
a9223fe208
|
ready for next release
|
2011-11-28 08:48:34 +11:00 |
Jesse McConnell
|
94124f7412
|
merge from master
|
2011-10-26 15:26:49 -05:00 |
Jesse McConnell
|
97d0d9d812
|
Updating VERSION.txt top section
|
2011-10-24 16:36:35 -05:00 |
Jesse McConnell
|
88bc111ac3
|
Updating VERSION.txt top section
|
2011-10-24 15:49:46 -05:00 |
Jesse McConnell
|
79c674a4ce
|
Updating VERSION.txt top section
|
2011-10-24 14:40:03 -05:00 |
Jesse McConnell
|
0405be3bed
|
Updating VERSION.txt top section
|
2011-10-24 14:31:16 -05:00 |
Jesse McConnell
|
2700581906
|
Merge from master
|
2011-10-13 07:59:30 -05:00 |
Jesse McConnell
|
ec1a23adc9
|
Updating VERSION.txt top section
|
2011-10-11 11:03:39 -05:00 |
Jesse McConnell
|
3e62343aae
|
Updating VERSION.txt top section
|
2011-10-11 09:48:57 -05:00 |
Jesse McConnell
|
2038d75c8c
|
Updating VERSION.txt top section
|
2011-10-11 09:47:05 -05:00 |
Jesse McConnell
|
925335dab2
|
merge from master
|
2011-10-11 09:43:27 -05:00 |
Jesse McConnell
|
55842580aa
|
Updating VERSION.txt top section
|
2011-10-11 08:25:05 -05:00 |
Jesse McConnell
|
22c15a8cb8
|
Updating VERSION.txt top section
|
2011-10-06 20:11:39 -05:00 |
Jesse McConnell
|
93c0cb62ca
|
Updating VERSION.txt top section
|
2011-10-06 19:38:14 -05:00 |
Jesse McConnell
|
3e1a8c08bc
|
Updating VERSION.txt top section
|
2011-10-06 17:32:47 -05:00 |
Jesse McConnell
|
97e286a1ab
|
update VERSION
|
2011-10-06 17:03:58 -05:00 |
Jesse McConnell
|
7958b033b0
|
Updating VERSION.txt top section
|
2011-10-06 09:22:28 -05:00 |
Jan Bartel
|
32dbb1bddb
|
Merge remote-tracking branch 'origin/master' 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/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-deploy/src/main/config/etc/jetty-deploy.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/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-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
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/jetty-osgi-servletbridge/pom.xml
jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
jetty-osgi/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/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-jetty6/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2011-10-04 17:45:15 +11:00 |
hmalphettes
|
ab6ff817a3
|
JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi.
|
2011-10-03 09:37:53 +08:00 |