1
0
Fork 0
Commit Graph

15 Commits

Author SHA1 Message Date
Jan Steemann e250a31b0c shaper changes 2015-02-15 21:53:27 +01:00
Jan Steemann ea0a5fa1d6 code simplification 2015-01-24 14:02:48 +01:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann f939b079c4 recovery 2014-07-03 22:49:49 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/voc-shaper.cpp
2014-06-06 17:00:49 +02:00
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +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
Jan Steemann 0a2e155f12 don't copy bytecode after creation 2014-05-17 12:05:15 +02:00
Jan Steemann 93179cc03b removed unused variable 2014-05-16 21:16:45 +02:00
Jan Steemann 81c68927aa remove no-ops from shape-accessor 2014-05-16 18:39:23 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann 9aaeafda10 cpp 2014-04-04 10:21:54 +02:00