Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,489 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

168 Commits

Author SHA1 Message Date
Jan Steemann 4e5cde8443 Revert "release version 2.3.0" 
This reverts commit 35d4368ad6f3f4ef8f37a2f43ed18c6c9ae5ccc6.

Conflicts:
	CHANGELOG
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/explain.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/tasks.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
 2014-12-16 01:30:21 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2014-12-15 21:53:51 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Frank Celler 9bd960fb21 release version 2.3.1 2014-11-28 20:01:19 +01:00
Frank Celler c9fb8f1a5b release version 2.3.0 2014-11-15 21:41:16 +01:00
Frank Celler f74849611d release version 2.3.0-beta2 2014-11-07 19:38:08 +01:00
Frank Celler 7e7262aa7f release version 2.3.0-beta1 2014-11-01 23:05:50 +01:00
Frank Celler 51f643e1db release version 2.3.0-alpha7 2014-11-01 20:44:05 +01:00
Frank Celler 82bf05f50f Merge branch 'devel' of github.com:triAGENS/ArangoDB into 2.3 
Conflicts:
	configure.ac
 2014-10-31 10:39:42 +01:00
Jan Steemann c19060da27 changed www.arangodb.org to www.arangodb.org 2014-10-30 19:17:25 +01:00
Jan Steemann d5517ffcf7 m4 cleanup 2014-10-29 20:36:56 +01:00
Frank Celler 396a684f90 release version 2.3.0-alpha6 2014-10-29 13:31:21 +01:00
Frank Celler 1492e9f90e release version 2.3.0-alpha5 2014-10-03 10:04:56 +02:00
Frank Celler 6b8d77832e release version 2.3.0-alpha4 2014-10-02 18:39:48 +02:00
Frank Celler ed551397fa Merge branch 'aql2' of github.com:triAGENS/ArangoDB into 2.3 
Conflicts:
	config/generateErrorfile.py
 2014-10-02 17:40:01 +02:00
Frank Celler 4f25f295ed release version 2.3.0-alpha3 2014-09-15 10:04:39 +02:00
Frank Celler 314858b871 release version 2.3.0-alpha2 2014-09-14 22:11:43 +02:00
Frank Celler f1d8aafddf release version 2.3.0-alpha1 2014-09-14 17:17:00 +02:00
Jan Steemann aa20c9e980 renamed last C files... 2014-09-13 22:38:25 +02:00
Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-15 18:47:18 +02:00
Frank Celler 6f5343bc81 raised version number 2014-08-15 09:41:59 +02:00
Willi Goesgens dd1845ac8a Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
Frank Celler 53047f7052 added RPM_OPTS 2014-06-26 13:03:29 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Frank Celler afc211ac5f added --with-bison 2014-06-20 15:06:17 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
Frank Celler 900aa7f33b moved gharial from /system to /_api 2014-06-18 14:08:06 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Jan Steemann 36567df644 removed libbson 2014-05-16 20:32:05 +02:00
Jan Steemann 14813638dd removed boost 2014-05-12 17:22:42 +02:00
Jan Steemann 07f3c479c0 print defaults 2014-04-08 10:00:42 +02:00
Max Neunhoeffer c33fd1395b Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-04-03 15:52:15 +02:00
Max Neunhoeffer b488e508a2 Add today's git version of libbson to 3rdParty. 2014-04-03 14:09:24 +02:00
Jan Steemann 32237dd7b2 bumped version number from 2.0 to 2.1 2014-04-03 13:42:55 +02:00
Frank Celler 56eb394f04 replace is now a protected virtual method 2014-03-12 18:19:50 +01:00
Frank Celler 33b15d7660 release version 2.0.0-rc1 2014-03-02 08:06:31 +01:00
Frank Celler 05e30a6b3e release version 2.0.0-beta2 2014-02-28 23:27:58 +01:00
Frank Celler c2706fd737 release version 2.0.0-beta1 2014-02-28 20:44:44 +01:00
Frank Celler 9a6d2e3f84 Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0 2014-02-27 16:51:18 +01:00
Frank Celler 134ec1b2bb added --enable-internal-go 2014-02-27 16:50:06 +01:00
Frank Celler dc7f16e2ae release version 2.0.0-alpha1 2014-02-27 13:28:13 +01:00
Max Neunhoeffer 9448ff8243 Add Makefile support for etcd. 2014-02-26 23:05:20 +01:00
Max Neunhoeffer db4158b9ae Make all-in-one-boost the default and say so. 2014-01-27 11:50:13 +01:00
Max Neunhoeffer 4f5b8f0462 Try to add boost libraries for shared_ptr. 2014-01-27 11:38:59 +01:00
Jan Steemann 9e21cf9b7e added configure option --enable-cluster 2013-12-10 14:46:16 +01:00
Frank Celler eea1fea806 fixed build number 2013-10-29 12:58:22 +01:00
Frank Celler ff36cad3a8 release version 1.4.0 2013-10-29 11:27:35 +01:00
Frank Celler d33bcdc623 rc1 2013-10-28 17:54:24 +01:00
Frank Celler 96d3c32cb7 added startup script 2013-10-27 20:14:48 +01:00
Frank Celler 63d2d0ac4c release version 1.4.0-beta2 2013-10-14 14:10:12 +02:00