Daniel Smith 66d55e0959 Merge pull request #6546 from lavalamp/fix ... Add to controller framework; use in scheduler		2015-04-10 16:20:17 -07:00
..
integration.go	Merge pull request #6546 from lavalamp/fix	2015-04-10 16:20:17 -07:00
v1beta1-controller.json	Updating integration tests to test both API versions - v1beta1 and 3	2015-03-18 15:24:11 -07:00
v1beta3-controller.json	Updating integration tests to test both API versions - v1beta1 and 3	2015-03-18 15:24:11 -07:00