Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets
authorNatasha Sherstneva <n.shertneva@gmail.com>
Thu, 5 Dec 2013 10:22:53 +0000 (10:22 +0000)
committerNatasha Sherstneva <n.shertneva@gmail.com>
Thu, 5 Dec 2013 10:22:53 +0000 (10:22 +0000)
commit6e4bd47e22036a7f0c7b66fe7ee4f188a7cffddb
treea0771abaac0b4cc07aa01eb19312cca8756b6dff
parent027e5ff55587cf7e8295066f9e43d56c180354f6
parent68377f711516ef7566fac3371eb4962b86b3ba19
Merge branch 'servlets' of https://source.jalview.org/git/proteocache into servlets

Conflicts:
server/compbio/controllers/JobExecutionTimeController.java
server/compbio/controllers/SequenceController.java
server/compbio/statistic/CassandraRequester.java
server/compbio/controllers/DailyStatisticsController.java
server/compbio/controllers/JobExecutionTimeController.java
server/compbio/controllers/SequenceController.java
server/compbio/statistic/CassandraRequester.java