Changeset [874cabc721e22bfd3cc5faed2e03291df52ee626] by Jonathan Lister
2010-10-12 17:13:03 UTC
Merge branch 'master' of git@github.com:lshift/diffa
http://github.com/lshift/diffa/commit/874cabc721e22bfd3cc5faed2e032...
Committed by Jonathan Lister
- A dist/src/main/assembly/resources/etc/demo.properties
- A dist/src/main/assembly/resources/etc/logback.xml
- A participants-web/src/test/resources/demo.itest.properties
- R agent/src/main/resources/diffa.properties
- R agent/src/main/resources/logback.xml
- R participants-web/src/main/resources/demo.properties
- M agent/src/main/scala/net/lshift/diffa/agent/rest/DifferencesResource.scala
- M agent/src/main/webapp/js/app.js
- M agent/src/test/scala/net/lshift/diffa/agent/itest/CommonDifferenceTests.scala
- M dist/src/main/assembly/resources/etc/diffa.properties
- M dist/src/main/assembly/resources/etc/jetty.xml
- M dist/src/main/assembly/resources/start.ini
- M json-messaging/src/main/scala/net/lshift/diffa/messaging/json/DifferencesRestClient.scala
- M json-messaging/src/main/scala/net/lshift/diffa/messaging/json/ParticipantHandler.scala
- M json-messaging/src/main/scala/net/lshift/diffa/messaging/json/ParticipantRestClient.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/client/DifferencesClient.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/differencing/DefaultSessionManager.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/differencing/LocalSessionCache.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/differencing/SessionCache.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/differencing/SessionManager.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/participants/MemoryParticipantBase.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/participants/Participant.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/participants/UpstreamMemoryParticipant.scala
- M kernel/src/test/scala/net/lshift/diffa/kernel/differencing/DefaultSessionManagerTest.scala
- M participants-web/pom.xml
- M participants-web/src/main/webapp/WEB-INF/applicationContext.xml
- M participants-web/src/test/conf/jetty-env.xml
- M participants/src/main/scala/net/lshift/diffa/participants/FileParticipant.scala
- M participants/src/main/scala/net/lshift/diffa/participants/UpstreamFileParticipant.scala
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
A Real Time Differencing Tool.