Change in ovirt-engine[master]: core: don't write payload data on export
by ofrenkel@redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: don't write payload data on export
......................................................................
core: don't write payload data on export
when creating OVF for export or snapshot,
the payload data should not be part of it,
as it may contain sensitive data and may be malformed for the xml.
Change-Id: I662aff50ee5cf7174a135a004081c48c4e1ab5b1
Bug-Url: https://bugzilla.redhat.com/997910
Signed-off-by: Omer Frenkel <ofrenkel(a)redhat.com>
---
M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18995
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I662aff50ee5cf7174a135a004081c48c4e1ab5b1
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: webadmin, userportal: translations update
by ecohen@redhat.com
Einav Cohen has submitted this change and it was merged.
Change subject: webadmin, userportal: translations update
......................................................................
webadmin, userportal: translations update
pulled translation from Zanata oVirt project, master version.
Change-Id: Ie3e855d251cd0ee4ee475972227cf7f0d8cbd73f
Signed-off-by: Einav Cohen <ecohen(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_de_DE.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_es_ES.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_ja_JP.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_pt_BR.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/gwt-common/src/main/resources/org/ovirt/engine/ui/common/CommonApplicationMessages_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_es_ES.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums_zh_CN.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_es_ES.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_fr_FR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_ja_JP.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIConstants_zh_CN.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_de_DE.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_pt_BR.properties
M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/UIMessages_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/ConsoleErrors_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/ConsoleErrors_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/ConsoleErrors_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_de_DE.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_es_ES.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_pt_BR.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/ApplicationMessages_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ja_JP.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_ko_KR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/ConsoleErrors_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/ConsoleErrors_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/VdsmErrors_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_es_ES.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_fr_FR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_ja_JP.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_pt_BR.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants_zh_CN.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_de_DE.properties
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationMessages_zh_CN.properties
M packaging/branding/ovirt.brand/messages_de_DE.properties
M packaging/branding/ovirt.brand/messages_es_ES.properties
M packaging/branding/ovirt.brand/messages_fr_FR.properties
M packaging/branding/ovirt.brand/messages_ja_JP.properties
M packaging/branding/ovirt.brand/messages_pt_BR.properties
M packaging/branding/ovirt.brand/messages_zh_CN.properties
66 files changed, 592 insertions(+), 559 deletions(-)
Approvals:
Einav Cohen: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18983
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3e855d251cd0ee4ee475972227cf7f0d8cbd73f
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-dwh[master]: packaging: setup: fix for DB creation in non default locale
by ydary@redhat.com
Yaniv Dary has submitted this change and it was merged.
Change subject: packaging: setup: fix for DB creation in non default locale
......................................................................
packaging: setup: fix for DB creation in non default locale
Change-Id: I016d1503ede16c2128cf8a1905bf420c99a2a4ce
Signed-off-by: Yaniv Dary <ydary(a)redhat.com>
---
M packaging/common_utils.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yaniv Dary: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19016
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I016d1503ede16c2128cf8a1905bf420c99a2a4ce
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>
11 years, 2 months
Change in ovirt-engine[master]: webadmin: Restricted VNIC names to ASCII characters
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: Restricted VNIC names to ASCII characters
......................................................................
webadmin: Restricted VNIC names to ASCII characters
Used to allow Unicode characters as well, which meant it was more
permissive than the backend validation.
Change-Id: Id85f0cec55ab073eff0a26acc884350d0977a1a0
Bug-Url: https://bugzilla.redhat.com/1002146
Signed-off-by: Lior Vernia <lvernia(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
A frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NoSpecialCharactersWithDotValidation.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
3 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18992
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id85f0cec55ab073eff0a26acc884350d0977a1a0
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[ovirt-engine-3.3]: restapi: Disallow endless authentication session #1005749
by mpastern@redhat.com
Michael Pasternak has submitted this change and it was merged.
Change subject: restapi: Disallow endless authentication session #1005749
......................................................................
restapi: Disallow endless authentication session #1005749
Change-Id: I3cabe1d9e42f390ee944d29f0dd78246689107dd
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1005749
Signed-off-by: Michael pasternak <mpastern(a)redhat.com>
---
M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java
1 file changed, 16 insertions(+), 5 deletions(-)
Approvals:
Michael Pasternak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19004
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cabe1d9e42f390ee944d29f0dd78246689107dd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.3
Gerrit-Owner: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: automation(a)ovirt.org
11 years, 2 months
Change in ovirt-engine[master]: restapi: Disallow endless authentication session #1005749
by mpastern@redhat.com
Michael Pasternak has submitted this change and it was merged.
Change subject: restapi: Disallow endless authentication session #1005749
......................................................................
restapi: Disallow endless authentication session #1005749
Change-Id: I3cabe1d9e42f390ee944d29f0dd78246689107dd
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1005749
Signed-off-by: Michael pasternak <mpastern(a)redhat.com>
---
M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/security/auth/Challenger.java
1 file changed, 16 insertions(+), 5 deletions(-)
Approvals:
Michael Pasternak: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/19003
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cabe1d9e42f390ee944d29f0dd78246689107dd
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: core: add job that runs HA VMs which failed to run
by ofrenkel@redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: add job that runs HA VMs which failed to run
......................................................................
core: add job that runs HA VMs which failed to run
This patch adds quartz job which is responsible to run highly available
VMs which are down. As a first step it would run HA VMs that could not
run because they were locked on last attempt.
This patch solves the following problem: when trying to run highly
available VM that went down during live storage migration, the
RunVmCommand fails because the VM is locked during the migration and the
VM won't be started again automatically. Now, when the lock could not be
acquired, the newly added job will periodically try to run the VM and
when the live storage migration will end, the VM will start.
Change-Id: I3d563d05efc6dae40f0de8e7f4b7e47aa84bd787
Bug-Url: https://bugzilla.redhat.com/891634
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoStartVmsRunner.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
5 files changed, 80 insertions(+), 0 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18815
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d563d05efc6dae40f0de8e7f4b7e47aa84bd787
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Barak Azulay <bazulay(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-engine[master]: webadmin: Added DC ID to profiles in Edit Network
by gchaplik@redhat.com
Gilad Chaplik has submitted this change and it was merged.
Change subject: webadmin: Added DC ID to profiles in Edit Network
......................................................................
webadmin: Added DC ID to profiles in Edit Network
The DC ID had formerly ben set to null, so when new profiles were
added the QoS list appeared empty.
Change-Id: I07f542510323a1ff1fa77436821ebbe9216b588c
Bug-Url: https://bugzilla.redhat.com/1005548
Signed-off-by: Lior Vernia <lvernia(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Gilad Chaplik: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18990
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07f542510323a1ff1fa77436821ebbe9216b588c
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Lior Vernia <lvernia(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months
Change in ovirt-dwh[master]: packaging: setup: fix for remote DB installation over otopi
by ydary@redhat.com
Yaniv Dary has submitted this change and it was merged.
Change subject: packaging: setup: fix for remote DB installation over otopi
......................................................................
packaging: setup: fix for remote DB installation over otopi
Change-Id: I4d5a50c158ebdf262283d18af8559c670d97e184
Signed-off-by: Yaniv Dary <ydary(a)redhat.com>
---
M packaging/ovirt-engine-dwh-setup.py
1 file changed, 17 insertions(+), 16 deletions(-)
Approvals:
Yaniv Dary: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18994
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d5a50c158ebdf262283d18af8559c670d97e184
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Yaniv Dary <ydary(a)redhat.com>
Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com>
11 years, 2 months
Change in ovirt-engine[master]: core: fix log when detecting HA VM went down
by ofrenkel@redhat.com
Omer Frenkel has submitted this change and it was merged.
Change subject: core: fix log when detecting HA VM went down
......................................................................
core: fix log when detecting HA VM went down
The previous log message noted that there was an error while starting
the VM everytime the monitoring detects that HA VM went down. This might
be wrong since the VM might already be UP before it went down. Thus,
this patch corrects the log message.
Change-Id: I563d914d9adfa7e555b1c5d21d39c10d5b1d4b41
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18814
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I563d914d9adfa7e555b1c5d21d39c10d5b1d4b41
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
11 years, 2 months