1
0
Fork 0
Commit Graph

461 Commits

Author SHA1 Message Date
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 8da6824d15 added TRI_ASSERT and TRI_ASSERT_EXPENSIVE 2014-06-06 10:32:20 +02:00
Jan Steemann b9b1db3e02 WAL logfile collection 2014-06-05 18:06:42 +02:00
Jan Steemann b1e2990172 wal collection 2014-06-04 14:28:11 +02:00
Jan Steemann e39e39b524 removed synchroniser 2014-06-02 16:04:56 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
2014-05-26 17:28:16 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
2014-05-25 23:10:10 +02:00
Max Neunhoeffer ba270940f6 Silence a few compiler warnings. 2014-05-23 10:30:30 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Jan Steemann 149f7378cb cpp 2014-04-03 23:22:32 +02:00