14 Commits

Author	SHA1	Message	Date
Andreas Streichardt	a0df762a42	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2016-02-05 18:30:43 +01:00
Frank Celler	4264fae2ab	fixed valgrind for testing	2016-02-05 18:22:26 +01:00
Andreas Streichardt	111050871e	Fix jslint	2016-02-05 17:23:35 +01:00
Andreas Streichardt	584c3564c6	Rework unittest cluster start logic	2016-02-05 14:25:17 +01:00
Andreas Streichardt	c0ed7f0429	Add peggy	2016-02-04 17:29:08 +01:00
Max Neunhoeffer	fc94a38184	Add an InitDone stamp to cluster plan.	2016-02-04 15:53:42 +01:00
Max Neunhoeffer	b0283077db	Merge branch 'devel' into ClustUp2	2016-01-11 11:41:36 +01:00
Max Neunhoeffer	e7eae3a73a	Merge branch 'devel' into ClustUp2	2016-01-11 11:01:45 +01:00
Jan Steemann	8390793699	moved docu blocks into their own files	2016-01-07 16:39:19 +01:00
Max Neunhoeffer	ad5446bf49	Set heartbeat interval to 5s.	2015-12-29 15:49:37 +01:00
Alan Plum	9ecc710491	Avoid _.clone ... Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.	2015-12-23 23:30:56 +01:00
Alan Plum	de9ae5128a	underscore -> lodash	2015-12-23 23:30:55 +01:00
jsteemann	b5fa1b4629	extremeVerbosity	2015-12-16 11:48:04 +01:00
Alan Plum	8853ede355	org/arangodb -> @arangodb	2015-12-15 15:51:44 +01:00