Commit Graph

15 Commits

Author SHA1 Message Date
Fabian Märki
0b41016535 Merge branch 'master' into ATEST-246
Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
2015-10-30 11:46:30 +01:00
Fabian Märki
2f6a012abb ATEST-246 2015-10-30 11:33:29 +01:00
Zellweger Christof Ralf
e7467aeea1 ATEST-259:
- removing unused test dependencies
2015-10-28 12:53:32 +01:00
Zellweger Christof Ralf
cd72af733a ATEST-259:
- adding tests, re-implementing a simpler CORS filter than previously
used
2015-10-28 12:52:32 +01:00
Fabian Märki
010c818f21 Whatever? 2015-09-16 15:00:31 +02:00
Fabian Märki
9b77c5538d ATEST-221 2015-09-11 13:55:55 +02:00
Fabian Märki
c751aab8de ATEST-205 2015-08-10 11:44:08 +02:00
Fabian Märki
c5b8c55970 ATEST-128 2015-08-07 08:38:37 +02:00
Fabian Märki
689622be07 Async read, query REST etc. 2015-07-24 15:34:35 +02:00
Fabian Märki
9b370cebe3 Reorder packages. 2015-07-20 17:04:16 +02:00
Fabian Märki
287659fa65 Fix jar name 2015-07-09 17:00:09 +02:00
Zellweger Christof Ralf
fa78ce234c ATEST-109:
- renaming hazelcast to query
2015-07-08 14:30:55 +02:00
Fabian Märki
cf044b2595 Provide dropit command. 2015-06-30 11:30:49 +02:00
Zellweger Christof Ralf
a26dd2424d ATEST-74:
- setup gradle multibuild
2015-06-10 14:18:37 +02:00
Zellweger Christof Ralf
0fe81045d5 initial commit 2015-05-27 16:59:20 +02:00