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 |
Jan Steemann
|
d2d7896846
|
moved classes to separate files
|
2012-10-17 15:23:10 +02:00 |
a-brandt
|
33a463e4d1
|
Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
|
2012-10-17 10:28:43 +02:00 |
a-brandt
|
45c0f7d937
|
updates
|
2012-10-17 10:27:50 +02:00 |
a-brandt
|
38fc1d21f5
|
bugfix IPv6 addresses
|
2012-10-17 10:23:03 +02:00 |
Frank Celler
|
f1eaaa7f04
|
fixed doc issue, doxygen sometimes does not recognize the used namespace
|
2012-10-16 17:34:54 +02:00 |
Oreste Panaia
|
2a71a3c371
|
minor changes for windows compatability
|
2012-09-28 17:34:22 +08:00 |