2805 Commits

Author	SHA1	Message	Date
Boaz Leskes	83a5fe9650	merge upstream/master	2015-12-18 22:45:34 +01:00
Ryan Ernst	4ea19995cf	Remove wildcard imports	2015-12-18 12:43:47 -08:00
Areek Zillur	9d9b557cea	Don't allow nodes with missing custom data types to join cluster	2015-12-18 11:33:29 -05:00
Simon Willnauer	eca2435838	Merge branch 'master' into settings_prototype	2015-12-18 09:15:58 +01:00
Ryan Ernst	6a99796b02	Build: Move test framework under a "test" top level dir ... This allows adding more test projects, eg integ test fixtures that will be coming soon.	2015-12-17 21:25:06 -08:00