Greg Wilkins
|
1cb201ef14
|
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-distribution/src/main/resources/bin/jetty.sh
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-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-03-14 12:40:29 +11:00 |
|
Greg Wilkins
|
38d701753c
|
403281 jetty.sh waits for started before OK
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
|
2013-03-14 11:50:06 +11:00 |
|
Jesse McConnell
|
acb5919844
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-12 09:10:50 -05:00 |
|
Jesse McConnell
|
d6ebdc0a4a
|
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
|
2013-03-12 09:10:42 -05:00 |
|
Jesse McConnell
|
0405c8ded6
|
[maven-release-plugin] prepare for next development iteration
|
2013-03-12 09:05:25 -05:00 |
|
Jesse McConnell
|
852178cd01
|
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
|
2013-03-12 09:05:14 -05:00 |
|
Jesse McConnell
|
d358030299
|
Merge branch 'jetty-7' into jetty-8
|
2013-03-12 08:32:34 -05:00 |
|
Jesse McConnell
|
9fd5881f93
|
[Bug 402735] jetty.sh to support status which is == check
|
2013-03-12 08:30:30 -05:00 |
|
Jesse McConnell
|
5c58878c3c
|
[maven-release-plugin] prepare for next development iteration
|
2013-01-31 11:34:38 -06:00 |
|
Jesse McConnell
|
ebbe37294f
|
[maven-release-plugin] prepare release jetty-8.1.9.v20130131
|
2013-01-31 11:34:30 -06:00 |
|
Jesse McConnell
|
a5e1e04af1
|
[maven-release-plugin] prepare for next development iteration
|
2013-01-31 08:42:20 -06:00 |
|
Jesse McConnell
|
b7fb18fd65
|
[maven-release-plugin] prepare release jetty-7.6.9.v20130131
|
2013-01-31 08:42:12 -06:00 |
|
Jesse McConnell
|
f0c6b9bc82
|
Merge branch 'jetty-7' into jetty-8
|
2013-01-29 15:51:56 -06:00 |
|
Jesse McConnell
|
ddce31a323
|
[Bug 396574] add JETTY_HOME as a location for pid to be found
|
2013-01-29 14:48:25 -06:00 |
|
Jesse McConnell
|
01f7bc1e12
|
Merge branch 'jetty-7' into jetty-8
|
2013-01-29 14:08:25 -06:00 |
|
Jesse McConnell
|
b9b7e76b7c
|
[Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found
|
2013-01-29 14:07:27 -06:00 |
|
Jesse McConnell
|
3b6cab63e2
|
Merge branch 'jetty-7' into jetty-8
|
2013-01-29 13:42:29 -06:00 |
|
Jesse McConnell
|
35ebe6cea3
|
[Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp
|
2013-01-29 13:34:45 -06:00 |
|
Jesse McConnell
|
bb27f561c1
|
[maven-release-plugin] prepare for next development iteration
|
2012-11-05 12:24:06 -06:00 |
|
Jesse McConnell
|
1d767e99a3
|
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
|
2012-11-05 12:23:59 -06:00 |
|
Jesse McConnell
|
70d591c430
|
[maven-release-plugin] prepare for next development iteration
|
2012-11-05 12:16:03 -06:00 |
|
Jesse McConnell
|
017826b4eb
|
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
|
2012-11-05 12:15:57 -06:00 |
|
Jesse McConnell
|
a8994178f5
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 14:18:11 -05:00 |
|
Jesse McConnell
|
92180a9700
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 14:18:01 -05:00 |
|
Jesse McConnell
|
10e4027579
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-10 13:59:34 -05:00 |
|
Jesse McConnell
|
57a6258f96
|
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
|
2012-09-10 13:59:10 -05:00 |
|
Jesse McConnell
|
1ec8b2621b
|
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
|
2012-09-10 13:47:05 -05:00 |
|
Jesse McConnell
|
4180d7e1f5
|
prepare for release
|
2012-09-10 12:59:04 -05:00 |
|
Jesse McConnell
|
d37deeea74
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:18 -05:00 |
|
Jesse McConnell
|
b418b0dd57
|
[maven-release-plugin] prepare for next development iteration
|
2012-09-03 13:33:16 -05:00 |
|
Jesse McConnell
|
41e9b1f6e2
|
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
|
2012-09-03 13:33:10 -05:00 |
|
Jesse McConnell
|
6c0b0af2fe
|
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
|
2012-09-03 13:33:08 -05:00 |
|
Jesse McConnell
|
136514948f
|
[maven-release-plugin] prepare for next development iteration
|
2012-07-16 13:24:49 -05:00 |
|
Jesse McConnell
|
1bbc677a09
|
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
|
2012-07-16 13:24:42 -05:00 |
|
Jesse McConnell
|
f755d014cd
|
[maven-release-plugin] prepare for next development iteration
|
2012-07-16 13:23:59 -05:00 |
|
Jesse McConnell
|
04b7e807a0
|
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
|
2012-07-16 13:23:53 -05:00 |
|
Jesse McConnell
|
c00bb2d6ca
|
reset for release
|
2012-07-16 12:55:22 -05:00 |
|
Jesse McConnell
|
f59b2a0632
|
reset release
|
2012-07-16 12:54:36 -05:00 |
|
Jesse McConnell
|
205e8f74f0
|
[maven-release-plugin] prepare for next development iteration
|
2012-07-13 10:20:48 -05:00 |
|
Jesse McConnell
|
c3b5269d60
|
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
|
2012-07-13 10:20:23 -05:00 |
|
Jesse McConnell
|
12ecc10c6a
|
[maven-release-plugin] prepare for next development iteration
|
2012-07-13 09:35:08 -05:00 |
|
Jesse McConnell
|
bf40110fb8
|
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
|
2012-07-13 09:34:52 -05:00 |
|
Jesse McConnell
|
30e8e40ef2
|
[maven-release-plugin] prepare for next development iteration
|
2012-05-24 15:41:45 -05:00 |
|
Jesse McConnell
|
667cf9a643
|
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
|
2012-05-24 15:41:38 -05:00 |
|
Jesse McConnell
|
d23a3c90b5
|
[maven-release-plugin] prepare for next development iteration
|
2012-05-24 15:40:47 -05:00 |
|
Jesse McConnell
|
57c73283d8
|
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
|
2012-05-24 15:40:35 -05:00 |
|
Jesse McConnell
|
e45a89694a
|
[maven-release-plugin] prepare for next development iteration
|
2012-05-24 09:30:58 -05:00 |
|
Jesse McConnell
|
36fc6fe890
|
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
|
2012-05-24 09:30:52 -05:00 |
|
Jesse McConnell
|
035e16aedc
|
[maven-release-plugin] prepare for next development iteration
|
2012-05-24 09:27:27 -05:00 |
|
Jesse McConnell
|
f8c629026d
|
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
|
2012-05-24 09:27:21 -05:00 |
|