Merge branch 'DAO'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 23 Jan 2014 14:33:17 +0000 (14:33 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Thu, 23 Jan 2014 14:33:17 +0000 (14:33 +0000)
commit7de49cca0d2c7525f698001533e0b48193715413
tree8c22c5ed347b7fdab210d8160b2058758c8c816a
parente715cf0b45f377f5b0965f212a2ef32fb8d7c5ed
parent6ea58f3b23cc65d5bb94f4aa5ed29fe90c91e4b7
Merge branch 'DAO'

Conflicts:
server/compbio/controllers/JobController.java
datadb/compbio/cassandra/CassandraNativeConnector.java
server/compbio/controllers/JobController.java