1
0
Fork 0
Commit Graph

16 Commits

Author SHA1 Message Date
Frank Celler 4804f2b324 fixed arangoirb compile error 2012-11-13 15:57:38 +01:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
2012-10-20 22:37:25 +02:00
a-brandt c70d081fc9 one more try for centos 5 2012-10-19 16:02:31 +02:00
a-brandt fbc20e6aed added some extra options for "make on centos 5 2012-10-19 15:26:10 +02:00
a-brandt 45c0f7d937 updates 2012-10-17 10:27:50 +02:00
a-brandt 07d1dfa2fc added "--build x86_64-apple-darwinXX.XX.XX" for MacOS X 2012-10-17 09:38:11 +02:00
a-brandt 83be41d2f0 disabled "mruby" 2012-10-16 17:23:42 +02:00
a-brandt 1b197a7bba configure options changed 2012-10-16 16:18:35 +02:00
a-brandt b1f25fc7e3 deleted "--enable-all-in-one" 2012-10-16 15:42:35 +02:00
a-brandt a192d73969 deleted "--enable-all-in-one" 2012-10-16 15:41:40 +02:00
a-brandt 3545ed527c added "make setup" 2012-10-16 15:05:17 +02:00
a-brandt b0f69deaf9 added "make setup" 2012-10-16 15:04:22 +02:00
Jan Steemann e4966844f4 remove invalid configure option 2012-10-11 23:16:45 +02:00
a-brandt e6f114e0cf added "--enable-mruby" 2012-09-25 17:05:40 +02:00
a-brandt cafcabeea5 disabled mruby 2012-09-25 16:46:55 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00