Commits · e4e870c6568e2268ca8564b61f8e3010a755181a · OSDU / OSDU Data Platform / Security and Compliance / Legal

Dec 27, 2021
- Migrate Legal Service to Anthos (new approach) (GONRG-3988) · 8b886ee0
  Riabokon Stanislav(EPAM)[GCP] authored 3 years ago
  
  8b886ee0
Nov 29, 2021

Update os-core-lib-aws version. · 3160071d

Morris Estepa authored 3 years ago

commit 0c8aaf2c 
Author: Morris Estepa <estepamo@amazon.com> 
Date: Mon Nov 29 2021 13:46:13 GMT-0600 (Central Standard Time) 

    Update os-core-lib-aws version.

3160071d

Oct 28, 2021
- Update version of default branch to 0.13.0-SNAPSHOT · 1894beff
  David Diederich authored 3 years ago
  
  1894beff
Oct 26, 2021

Legal int test fix · a75678f9

Spencer Sutton authored 3 years ago

commit bb5e4245 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger


commit d8d0fd56 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) 

    Fixing broken unit test


commit 36b1e2f7 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) 

    Adding log warning


commit 3a0c1745 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) 

    Fixing problem where data partitions got stuck across calls


commit 9dbff512 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) 

    Fixing bug with compliance process, partitions weren't handled right


commit b663408a 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) 

    Adding custom class to include data partition

a75678f9

properly copy parent pom · b11416a8
Matt Wise authored 3 years ago and Spencer Sutton committed 3 years ago

b11416a8

Oct 22, 2021
- Upgrading OSDU Dependencies to the latest released version · 4fb489fa
  David Diederich authored 3 years ago
  
  4fb489fa
Oct 21, 2021
- upgrade core lib version to 0.12.0-SNAPSHOT · fb79a9be
  Ashwani Pandey authored 3 years ago and Shrikant Garg committed 3 years ago
  
  fb79a9be
Oct 18, 2021
- Reverting pom version changes · ea102dec
  Spencer Sutton authored 3 years ago
  
  ea102dec
Oct 14, 2021

Legal int test fix · a332fae1

Spencer Sutton authored 3 years ago

commit bb5e4245 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:13:38 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into compliance-trigger


commit d8d0fd56 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 15:12:47 GMT-0500 (Central Daylight Time) 

    Fixing broken unit test


commit 36b1e2f7 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Thu Oct 14 2021 10:54:20 GMT-0500 (Central Daylight Time) 

    Adding log warning


commit 3a0c1745 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 14:34:37 GMT-0500 (Central Daylight Time) 

    Fixing problem where data partitions got stuck across calls


commit 9dbff512 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Wed Oct 13 2021 12:51:01 GMT-0500 (Central Daylight Time) 

    Fixing bug with compliance process, partitions weren't handled right


commit b663408a 
Author: Spencer Sutton <suttonsp@amazon.com> 
Date: Fri Oct 08 2021 15:11:59 GMT-0500 (Central Daylight Time) 

    Adding custom class to include data partition

a332fae1

Sep 15, 2021
- Removing snapshots · bf3dcae2
  Spencer Sutton authored 3 years ago
  
  bf3dcae2
Aug 30, 2021
- Update version of default branch to 0.12.0-SNAPSHOT · 943d1f89
  David Diederich authored 3 years ago
  
  943d1f89
Aug 29, 2021
- Updating OSDU dependencies, to maintain use of the latest release among those... · 2e5b344a
  David Diederich authored 3 years ago
  
  Updating OSDU dependencies, to maintain use of the latest release among those that were previously doing so
  2e5b344a
Aug 26, 2021
- properly copy parent pom · ec98d1d3
  Matt Wise authored 3 years ago
  
  ec98d1d3
Aug 25, 2021
- update log level of happy path logs to debug level · f28e5441
  Kelly Zhou authored 3 years ago
  
  f28e5441
Aug 20, 2021
- Update pom.xml - Storage blob version · 3a9abd07
  Akansha Rajput[Microsoft] authored 3 years ago
  
  3a9abd07
Aug 12, 2021
- Added new version info endpoint (GONRG-2681) · 08822240
  Dmitrii Novikov (EPAM) authored 3 years ago and Riabokon Stanislav(EPAM)[GCP] committed 3 years ago
  
  08822240
Jul 22, 2021
- Update version of default branch to 0.11.0-SNAPSHOT · 147a06d0
  David Diederich authored 3 years ago
  
  147a06d0
Jul 21, 2021
- Updating Libraries to Latest Release Version · 0440fcb7
  David Diederich authored 3 years ago
  
  0440fcb7
Jul 13, 2021
- Updating notice · 467ee351
  Spencer Sutton authored 3 years ago
  
  467ee351
- Fixing test · d83a0209
  Spencer Sutton authored 3 years ago
  
  d83a0209
- Debugging pipeline · b0096849
  Spencer Sutton authored 3 years ago
  
  b0096849
- Debugging pipeline · 93bf6e34
  Spencer Sutton authored 3 years ago
  
  93bf6e34
- Updating core lib aws version · 0fd4e273
  Spencer Sutton authored 3 years ago
  
  0fd4e273
Jul 06, 2021
- Using version 0.9.2 for core lib aws · 1a2bc6ac
  Spencer Sutton authored 3 years ago
  
  1a2bc6ac
Jun 02, 2021
- Update version of default branch to 0.10.0-SNAPSHOT · b853f166
  David Diederich authored 3 years ago
  
  b853f166
- Changing to the release versions of library dependencies · 23a525b6
  David Diederich authored 3 years ago
  
  23a525b6
May 19, 2021
- should return AppError instead of String · 4c2f0d26
  Kelly Zhou authored 3 years ago and Sherman Yang committed 3 years ago
  
  4c2f0d26
May 17, 2021
- Remove dependencies with vulnerabilities · 264dde38
  Rostislav Vatolin [SLB] authored 3 years ago
  
  264dde38
May 14, 2021

Mult-tenant with config file · 8c267411

Spencer Sutton authored 3 years ago

commit c4656bd5 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 14 2021 09:04:46 GMT-0500 (Central Daylight Time) 

    Updates, cleaner


commit 69fc7738 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 15:52:14 GMT-0500 (Central Daylight Time) 

    int tests needed update for config file


commit 4322d55a 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 15:06:54 GMT-0500 (Central Daylight Time) 

    legal test pom version bump


commit 24c60ca9 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 14:02:41 GMT-0500 (Central Daylight Time) 

    Bumping version


commit d1cc5277 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 13:22:18 GMT-0500 (Central Daylight Time) 

    Bumping aws version


commit d0aafd6b 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 13:12:59 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into multi-tenant


commit 5542302b 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Thu May 13 2021 10:49:02 GMT-0500 (Central Daylight Time) 

    Partitioning config file, creating on default


commit 1c744c98 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 14:05:13 GMT-0500 (Central Daylight Time) 

    merge


commit dda616dd 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 13:10:40 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit b2b8fd21 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:12:48 GMT-0500 (Central Daylight Time) 

    Version reverted?


commit d395c4ac 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:07:35 GMT-0500 (Central Daylight Time) 

    Missed partition in table name


commit 084ccea3 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:00:42 GMT-0500 (Central Daylight Time) 

    Updating query helper to v2


commit 64df8896 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:48:53 GMT-0500 (Central Daylight Time) 

    Updating legal doc


commit 64a5bccd 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:47:45 GMT-0500 (Central Daylight Time) 

    More cleanup


commit 29f09c4b 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:42:23 GMT-0500 (Central Daylight Time) 

    Some cleanup


commit a663c3f1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:41:31 GMT-0500 (Central Daylight Time) 

    Updating legal testing aws pom


commit 0222a310 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:40:36 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into multi-tenant


commit ac28485a 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:44 GMT-0500 (Central Daylight Time) 

    Reverting previous debug change


commit a956a5a1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:12 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit 09734341 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 10:44:52 GMT-0500 (Central Daylight Time) 

    Temp debugging deployed


commit d958f657 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:46:13 GMT-0500 (Central Daylight Time) 

    Merged


commit 7fc77652 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:33:56 GMT-0500 (Central Daylight Time) 

    Removing superfluos code


commit 57a24b40 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 13:01:23 GMT-0500 (Central Daylight Time) 

    Consolidating s3 client classes


commit c6f635ba 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 12:40:15 GMT-0500 (Central Daylight Time) 

    Cleaning up


commit 5c9e8475 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:59:24 GMT-0500 (Central Daylight Time) 

    Updating core lib aws version


commit e3e0f9c4 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:45:09 GMT-0500 (Central Daylight Time) 

    Adjusting  tests for mult-tenancy


commit 7064328e 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:57:11 GMT-0500 (Central Daylight Time) 

    Deleted accidental key


commit a65471ea 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:56:30 GMT-0500 (Central Daylight Time) 

    Updating to be multi-tenant

8c267411

May 11, 2021

Fixing int tests · 9692640b

Spencer Sutton authored 3 years ago

commit 1c744c98 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 14:05:13 GMT-0500 (Central Daylight Time) 

    merge


commit dda616dd 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 13:10:40 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit b2b8fd21 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:12:48 GMT-0500 (Central Daylight Time) 

    Version reverted?


commit d395c4ac 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:07:35 GMT-0500 (Central Daylight Time) 

    Missed partition in table name


commit 084ccea3 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Tue May 11 2021 10:00:42 GMT-0500 (Central Daylight Time) 

    Updating query helper to v2


commit 64df8896 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:48:53 GMT-0500 (Central Daylight Time) 

    Updating legal doc


commit 64a5bccd 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:47:45 GMT-0500 (Central Daylight Time) 

    More cleanup


commit 29f09c4b 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:42:23 GMT-0500 (Central Daylight Time) 

    Some cleanup


commit a663c3f1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:41:31 GMT-0500 (Central Daylight Time) 

    Updating legal testing aws pom


commit 0222a310 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:40:36 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into multi-tenant


commit ac28485a 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:44 GMT-0500 (Central Daylight Time) 

    Reverting previous debug change


commit a956a5a1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:12 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit 09734341 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 10:44:52 GMT-0500 (Central Daylight Time) 

    Temp debugging deployed


commit d958f657 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:46:13 GMT-0500 (Central Daylight Time) 

    Merged


commit 7fc77652 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:33:56 GMT-0500 (Central Daylight Time) 

    Removing superfluos code


commit 57a24b40 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 13:01:23 GMT-0500 (Central Daylight Time) 

    Consolidating s3 client classes


commit c6f635ba 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 12:40:15 GMT-0500 (Central Daylight Time) 

    Cleaning up


commit 5c9e8475 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:59:24 GMT-0500 (Central Daylight Time) 

    Updating core lib aws version


commit e3e0f9c4 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:45:09 GMT-0500 (Central Daylight Time) 

    Adjusting  tests for mult-tenancy


commit 7064328e 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:57:11 GMT-0500 (Central Daylight Time) 

    Deleted accidental key


commit a65471ea 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:56:30 GMT-0500 (Central Daylight Time) 

    Updating to be multi-tenant

9692640b

May 07, 2021

fix os-core-lib-aws version · 296fab77
Rucha Deshpande authored 3 years ago

296fab77

Legal int test update aws · dea9283b

Spencer Sutton authored 3 years ago

commit 64df8896 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:48:53 GMT-0500 (Central Daylight Time) 

    Updating legal doc


commit 64a5bccd 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:47:45 GMT-0500 (Central Daylight Time) 

    More cleanup


commit 29f09c4b 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:42:23 GMT-0500 (Central Daylight Time) 

    Some cleanup


commit a663c3f1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:41:31 GMT-0500 (Central Daylight Time) 

    Updating legal testing aws pom


commit 0222a310 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:40:36 GMT-0500 (Central Daylight Time) 

    Merge branch 'dev' of codecommit::us-east-1://default@os-legal into multi-tenant


commit ac28485a 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:44 GMT-0500 (Central Daylight Time) 

    Reverting previous debug change


commit a956a5a1 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 13:39:12 GMT-0500 (Central Daylight Time) 

    Fixing int tests


commit 09734341 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Fri May 07 2021 10:44:52 GMT-0500 (Central Daylight Time) 

    Temp debugging deployed


commit d958f657 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:46:13 GMT-0500 (Central Daylight Time) 

    Merged


commit 7fc77652 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 15:33:56 GMT-0500 (Central Daylight Time) 

    Removing superfluos code


commit 57a24b40 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 13:01:23 GMT-0500 (Central Daylight Time) 

    Consolidating s3 client classes


commit c6f635ba 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 12:40:15 GMT-0500 (Central Daylight Time) 

    Cleaning up


commit 5c9e8475 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:59:24 GMT-0500 (Central Daylight Time) 

    Updating core lib aws version


commit e3e0f9c4 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 11:45:09 GMT-0500 (Central Daylight Time) 

    Adjusting  tests for mult-tenancy


commit 7064328e 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:57:11 GMT-0500 (Central Daylight Time) 

    Deleted accidental key


commit a65471ea 
Author: Spencer Sutton <spencerpsutton@yahoo.com> 
Date: Wed May 05 2021 10:56:30 GMT-0500 (Central Daylight Time) 

    Updating to be multi-tenant

dea9283b

Apr 10, 2021
- Update version of default branch to 0.9.0-SNAPSHOT · 958ee2d4
  David Diederich authored 3 years ago
  
  958ee2d4
Mar 09, 2021
- Update version of default branch to 0.8.0-SNAPSHOT · 45419b08
  David Diederich authored 4 years ago
  
  45419b08
Feb 18, 2021

Squashed commit of the following · 7a789c12

Bill Wang authored 4 years ago

commit 07cf8431 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Tue Dec 29 2020 09:31:46 GMT-0800 (Pacific Standard Time) 

    fix minor env name


commit f3afaca1 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Tue Dec 29 2020 07:15:36 GMT-0800 (Pacific Standard Time) 

    swap env line


commit 8b5b33fc 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 18:52:44 GMT-0800 (Pacific Standard Time) 

    revert back region + endpoint, modify env setup


commit e05ce2e8 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 18:23:00 GMT-0800 (Pacific Standard Time) 

    fix S3 client instantiation


commit ee38f441 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:53:19 GMT-0800 (Pacific Standard Time) 

    suppress verbose log


commit d6134fbd 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:41:10 GMT-0800 (Pacific Standard Time) 

    resolve region


commit b8720bf2 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 28 2020 13:14:41 GMT-0800 (Pacific Standard Time) 

    bump core service version


commit 110f48ec 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 21 2020 13:14:08 GMT-0800 (Pacific Standard Time) 

    bump os-core-lib-aws version

7a789c12

Squashed commit of the following · 8b5bc0dd

Bill Wang authored 4 years ago

commit 110f48ec 
Author: zhijie wang <wanzhiji@amazon.com> 
Date: Mon Dec 21 2020 13:14:08 GMT-0800 (Pacific Standard Time) 

    bump os-core-lib-aws version to address multi-region test

8b5bc0dd

Feb 10, 2021
- Updating all POM files to match the same version number · 99a9baec
  David Diederich authored 4 years ago
  
  99a9baec
Nov 12, 2020
- copy parent pom to dist · c34e104c
  Matt Wise authored 4 years ago
  
  c34e104c
Nov 09, 2020
- Fixed project id from 146 (Workflow Service) back to 74 (Legal) · 7a4c224a
  Dmitriy Rudko authored 4 years ago
  
  7a4c224a
Nov 08, 2020
- GONRG-940 · 60640557
  Riabokon Stanislav(EPAM)[GCP] authored 4 years ago and Rostislav Dublin (EPAM) committed 4 years ago
  
  Pass properties to audit event
  60640557