Merge branch 'DAO' of https://source.jalview.org/git/proteocache into DAO
authorNatasha Sherstneva <n.shertneva@gmail.com>
Fri, 31 Jan 2014 10:37:32 +0000 (10:37 +0000)
committerNatasha Sherstneva <n.shertneva@gmail.com>
Fri, 31 Jan 2014 10:37:32 +0000 (10:37 +0000)
commitd1048dc77b419ac536dee9ce6fa3113613172b9c
treedddae1efbffa66ca4007dc9b3a637c0e42b0bdd9
parent3f8887a303cd1605d9a5e752ca50f9691c4fe6e8
parentbdb2d648d4b27a0ff5d1c264ef52c27e27f59984
Merge branch 'DAO' of https://source.jalview.org/git/proteocache into DAO

Conflicts:
datadb/compbio/cassandra/CassandraReaderOld.java
server/compbio/statistic/CassandraRequester.java
datadb/compbio/cassandra/readers/CassandraReader.java
server/compbio/controllers/JobController.java
server/compbio/controllers/SSFeaturesController.java