Merge branch 'master' into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 19 Dec 2013 12:42:04 +0000 (12:42 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 19 Dec 2013 12:42:04 +0000 (12:42 +0000)
commit5a44c7fd7f9802f255bf43489ff325af2df5eb94
tree3d030f4f0f844ff7f61118eb710f678bd4fde523
parent6e4bd47e22036a7f0c7b66fe7ee4f188a7cffddb
parentd616db97e837bcde43c939f228993c7d6e396a3c
Merge branch 'master' into servlets

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