Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2014-10-09 21:53:43 +0000
committerGreg Wilkins2014-10-09 21:53:43 +0000
commit758ce66c8d38f7cda3174b2f169d2bf72da58574 (patch)
treee556dd3ed762136df46a55d02f3af6356bafa2bf /tests/test-sessions/pom.xml
parent6ed01709133ab1326479f2f46ce0ecf74905d3d0 (diff)
parent2f696e87bd7e57e7ac6f55b86d40efee8b4614c0 (diff)
downloadorg.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.tar.gz
org.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.tar.xz
org.eclipse.jetty.project-758ce66c8d38f7cda3174b2f169d2bf72da58574.zip
Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts: jetty-websocket/pom.xml tests/test-sessions/test-mongodb-sessions/pom.xml
Diffstat (limited to 'tests/test-sessions/pom.xml')
-rw-r--r--tests/test-sessions/pom.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml
index 67fb24055e..dc15b9181d 100644
--- a/tests/test-sessions/pom.xml
+++ b/tests/test-sessions/pom.xml
@@ -34,6 +34,6 @@
<module>test-hash-sessions</module>
<module>test-jdbc-sessions</module>
<!-- Requires mongodb server running -->
- <!-- module>test-mongodb-sessions</module -->
+ <module>test-mongodb-sessions</module>
</modules>
</project>

Back to the top