merge in nyc-release history after reset to master
diff --git a/dbus/shill/dbus-constants.h b/dbus/shill/dbus-constants.h index 00a1459..c1d6864 100644 --- a/dbus/shill/dbus-constants.h +++ b/dbus/shill/dbus-constants.h
@@ -404,6 +404,7 @@ const char kNameServersProperty[] = "NameServers"; const char kDelegatedPrefixProperty[] = "DelegatedPrefix"; const char kDelegatedPrefixLengthProperty[] = "DelegatedPrefixLength"; +const char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds"; // IPConfig type options. const char kTypeIPv4[] = "ipv4";