1
0
Fork 0
Commit Graph

9 Commits

Author SHA1 Message Date
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
2014-06-05 22:58:49 +02:00
Frank Celler 2cfb2e0577 fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview
Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.cpp
	lib/ShapedJson/shape-accessor.h
2014-06-05 15:58:19 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Jan Steemann 81c68927aa remove no-ops from shape-accessor 2014-05-16 18:39:23 +02:00
Jan Steemann 9aaeafda10 cpp 2014-04-04 10:21:54 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00