3 Commits

Include renames

Author	SHA1	Message	Date
Alfonso Acosta	ce5dd847e9	[proxy] Add --hostname-from-label ... This allows registering container hostnames based on a label provided when creating the container.	2015-09-04 17:02:07 +01:00
Matthias Radestock	fa2aa1f791	Merge branch '1.0' ... Conflicts: test/640_proxy_restart_reattaches_test.sh	2015-08-13 19:46:23 +01:00
Matthias Radestock	36292216fd	rename tests so they actually run ... These tests were introduced in #1065 and #1126.	2015-07-14 19:47:15 +01:00