193ecce8f3f873c3b11daf81c684a262c5f39021 e9d4667c5fd636fcc81d26463f9c684b06a3e384 Jannis Leidel jannis@leidel.info http://github.com/jezdez/django/commit/4583391a97b6ffc26802161a5d4a1b3c1082dacc 4583391a97b6ffc26802161a5d4a1b3c1082dacc 2009-03-18T01:10:01-07:00 2009-03-18T01:10:01-07:00 Merge branch 'master' into comment-utils 9614cfb8995ecaa2f8e3eaccf0ebb0576cb94092 Jannis Leidel jannis@leidel.info fbfcde1eefb9006ac31e82fd4f26c6880e570eec jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/e9d4667c5fd636fcc81d26463f9c684b06a3e384 e9d4667c5fd636fcc81d26463f9c684b06a3e384 2009-03-17T20:03:24-07:00 2009-03-17T20:03:24-07:00 Fixed #10530, #10527: added a couple more validation errors around `list_editable`. Thanks, Florian Apolloner. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10080 bcc190cf-cafb-0310-a4f2-bffc1f526a37 5123489a8d74ef5699bcc3f927baa67870223b8a jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 d16485405a0e43106370cc8d75078370259cdae7 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/fbfcde1eefb9006ac31e82fd4f26c6880e570eec fbfcde1eefb9006ac31e82fd4f26c6880e570eec 2009-03-17T17:59:40-07:00 2009-03-17T17:59:40-07:00 Fixed #10526 -- More fixes when specifying installed apps using "foo.*". This adds a case that was missed in r9924: underscore handling. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10078 bcc190cf-cafb-0310-a4f2-bffc1f526a37 44f7e36cb8b6ae1b4aef583df2b81b1399cb11a0 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 04a4a447b30017f3d763af22c343f58c5808101d jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/d16485405a0e43106370cc8d75078370259cdae7 d16485405a0e43106370cc8d75078370259cdae7 2009-03-17T13:51:47-07:00 2009-03-17T13:51:47-07:00 Fixed #8939: added a `list_editable` option to `ModelAdmin`; fields declared `list_editable` may be edited, in bulk, on the changelist page. Thanks, Alex Gaynor. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10077 bcc190cf-cafb-0310-a4f2-bffc1f526a37 b7fe40fd4a316fea577f140bb3357a9b4f5274a1 jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 8e58c5d969c839f94eee0fb14c074e7f578dd1fb jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/04a4a447b30017f3d763af22c343f58c5808101d 04a4a447b30017f3d763af22c343f58c5808101d 2009-03-17T13:40:01-07:00 2009-03-17T13:40:01-07:00 `ModelAdmin` validation now runs when using the `site.register(Model, **kwargs)` form. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10074 bcc190cf-cafb-0310-a4f2-bffc1f526a37 bc34bea94d072d60b6a2e1bf72b27902e0864acd jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 9548bd80bc15b50304f15da713863a9046e44074 jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/8e58c5d969c839f94eee0fb14c074e7f578dd1fb 8e58c5d969c839f94eee0fb14c074e7f578dd1fb 2009-03-17T12:23:23-07:00 2009-03-17T12:23:23-07:00 Fixed `BaseFormSet.is_multipart()` so that it doesn't bomb when called on an empty formset. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10073 bcc190cf-cafb-0310-a4f2-bffc1f526a37 0d1236d5a23ae3f5ece4185c53a4330a24b76bd5 jacob jacob@bcc190cf-cafb-0310-a4f2-bffc1f526a37 701108619df9cd808858b097cffc53b8f6f023b8 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/9548bd80bc15b50304f15da713863a9046e44074 9548bd80bc15b50304f15da713863a9046e44074 2009-03-17T03:40:04-07:00 2009-03-17T03:40:04-07:00 Fixed #10517 -- Corrected cache name for file-based cache tests so that the filename can be valid under Windows. Thanks to Bob Thomas for the report and fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10071 bcc190cf-cafb-0310-a4f2-bffc1f526a37 305b14f265dd435ba7c72a1890c82768eaf64c10 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 683dfece1047b4c64addf571564f89f39fce4917 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/701108619df9cd808858b097cffc53b8f6f023b8 701108619df9cd808858b097cffc53b8f6f023b8 2009-03-17T03:30:17-07:00 2009-03-17T03:30:17-07:00 Fixed #10512 -- Corrected the handling of extra fields on a ModelForm. Thanks to Alex Gaynor for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10070 bcc190cf-cafb-0310-a4f2-bffc1f526a37 2e4ac33f483f918df57a03877a1e296d52a7f089 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 559087d2b0aaec29d4c747331eb48aae5e9f08d7 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/683dfece1047b4c64addf571564f89f39fce4917 683dfece1047b4c64addf571564f89f39fce4917 2009-03-15T17:34:58-07:00 2009-03-15T17:34:58-07:00 More fixing of PostgreSQL < 8.2 problems with the psycopg2 backend. Affects the postgresql_psycopg2 backend only. We now don't use the "RETURNING" syntax in SQL INSERT statements unless it's required by the autocommit behaviour. This fixes an edge-case that could cause crashes with earlier PostgreSQL versions, but the broader problem remains to be fixed (which is #10509). Fixed #10467. Refs #10509. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10065 bcc190cf-cafb-0310-a4f2-bffc1f526a37 0682ef317e0ce1e31a9c8d52c0e006493a8733a0 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 6a9edf6a4e0b24918cd8e792cc979a67828f4ceb 11cae8d4151e13329cbc4f642df922efc865e406 Jannis Leidel jannis@leidel.info http://github.com/jezdez/django/commit/193ecce8f3f873c3b11daf81c684a262c5f39021 193ecce8f3f873c3b11daf81c684a262c5f39021 2009-03-15T11:31:58-07:00 2009-03-15T11:31:58-07:00 Merge branch 'master' into comment-utils e4d4b0f9af6c7700b1f56d789a9243128d74fb28 Jannis Leidel jannis@leidel.info 11cae8d4151e13329cbc4f642df922efc865e406 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/559087d2b0aaec29d4c747331eb48aae5e9f08d7 559087d2b0aaec29d4c747331eb48aae5e9f08d7 2009-03-15T04:21:41-07:00 2009-03-15T04:21:41-07:00 Fixed #10507 -- Corrected formatting problem in ModelForm docs. Thanks to Paul Menzel for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10064 bcc190cf-cafb-0310-a4f2-bffc1f526a37 9d1d042475efeeec2a7c105a26389cb9ecb24cf6 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 771d686a37b9a350128b3611bc15f2bab33f2409 gwilson gwilson@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/11cae8d4151e13329cbc4f642df922efc865e406 11cae8d4151e13329cbc4f642df922efc865e406 2009-03-14T22:54:28-07:00 2009-03-14T22:54:28-07:00 Fixed #689 -- Added a middleware and authentication backend to contrib.auth for supporting external authentication solutions. Thanks to all who contributed to this patch, including Ian Holsman, garthk, Koen Biermans, Marc Fargas, ekarulf, and Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10063 bcc190cf-cafb-0310-a4f2-bffc1f526a37 3fabfa4d7996c918d0e73bc8aa3c08f644a9ca97 gwilson gwilson@bcc190cf-cafb-0310-a4f2-bffc1f526a37 0cb473e76fefb8a8eeb1c72702520682d0ff71ce russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/771d686a37b9a350128b3611bc15f2bab33f2409 771d686a37b9a350128b3611bc15f2bab33f2409 2009-03-14T22:05:26-07:00 2009-03-14T22:05:26-07:00 Fixed #8164 -- Fields on a ModelForm are now ordered in the order specified in the fields attribute of the ModelForm's Meta class. Thanks to Alex Gaynor for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10062 bcc190cf-cafb-0310-a4f2-bffc1f526a37 1719b7912b1ff949b6ac17b08156ceb42071f56d russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 e4d494d7d03126a3c9db610f6e476c1d895cebc4 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/0cb473e76fefb8a8eeb1c72702520682d0ff71ce 0cb473e76fefb8a8eeb1c72702520682d0ff71ce 2009-03-14T20:42:31-07:00 2009-03-14T20:42:31-07:00 Documented patterns for adding extra managers to model subclasses. This seems to have been a source of confusion, so now we have some explicit examples. Fixed #9676. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10058 bcc190cf-cafb-0310-a4f2-bffc1f526a37 41461cf0d01f4226a4fcd9a2b163e8d7d8c71619 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 282e331e4413710295f9cc28593ed6484735b525 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/e4d494d7d03126a3c9db610f6e476c1d895cebc4 e4d494d7d03126a3c9db610f6e476c1d895cebc4 2009-03-14T20:42:08-07:00 2009-03-14T20:42:08-07:00 Clarified and expanded documentation for Manager.use_for_related_fields. This is for Manager subclasses that are default managers, but only sometimes. The general rule is: "don't use it." If you really need it, read the instructions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10057 bcc190cf-cafb-0310-a4f2-bffc1f526a37 fd12e2bff2aa722e1128589f47a849f4e28f5233 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 3fd727f92c0d862ff0117bd155c662cab80e3663 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/282e331e4413710295f9cc28593ed6484735b525 282e331e4413710295f9cc28593ed6484735b525 2009-03-14T20:41:33-07:00 2009-03-14T20:41:33-07:00 Use plain model.Manager, or suitable proxy, for model saving. We can't use the default manager in Model.save_base(), since we need to retrieve existing objects which might be filtered out by that manager. We now always use a plain Manager instance at that point (or something that can replace it, such as a GeoManager), making all existing rows in the database visible to the saving code. The logic for detecting a "suitable replacement" plain base is the same as for related fields: if the use_for_related_fields is set on the manager subclass, we can use it. The general requirement here is that we want a base class that returns the appropriate QuerySet subclass, but does not restrict the rows returned. Fixed #8990, #9527. Refs #2698 (which is not fixed by this change, but it's the first part of a larger change to fix that bug.) git-svn-id: http://code.djangoproject.com/svn/django/trunk@10056 bcc190cf-cafb-0310-a4f2-bffc1f526a37 1e92d02ddce69b58fc21439a4ca1a7e5c813730e mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 58eae68face6f953a97b6cf72e7ad2333017395f adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/3fd727f92c0d862ff0117bd155c662cab80e3663 3fd727f92c0d862ff0117bd155c662cab80e3663 2009-03-14T15:51:05-07:00 2009-03-14T15:51:05-07:00 Made a bunch of edits to docs/topics/cache.txt, mostly based on stuff from the Django Book git-svn-id: http://code.djangoproject.com/svn/django/trunk@10055 bcc190cf-cafb-0310-a4f2-bffc1f526a37 d5aecff799574ff01f94bdce37a862fe80836518 adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 477e8cceb7173cc3f6801e2dd119233ab503e33d russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/58eae68face6f953a97b6cf72e7ad2333017395f 58eae68face6f953a97b6cf72e7ad2333017395f 2009-03-13T22:18:02-07:00 2009-03-13T22:18:02-07:00 Fixed #10102 -- Set svn:executable on daily_cleanup script. Thanks to John Scott for the report git-svn-id: http://code.djangoproject.com/svn/django/trunk@10054 bcc190cf-cafb-0310-a4f2-bffc1f526a37 4e65eaae5d6b91e260249248eec9b8d5f8698f65 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 a867050932b372a211c6a4d8cd8a7c2ea3762627 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/477e8cceb7173cc3f6801e2dd119233ab503e33d 477e8cceb7173cc3f6801e2dd119233ab503e33d 2009-03-13T21:32:52-07:00 2009-03-13T21:32:52-07:00 Fixed #10425 -- Corrected the interaction of .count() with .annotate() when .values() is also involved. Thanks to kmassey for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10053 bcc190cf-cafb-0310-a4f2-bffc1f526a37 989b0bfbcdc518fe47006f95e3309f988512746a russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 833fa46230c5b79dcd7cb5729fa4087668ad48ce ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/a867050932b372a211c6a4d8cd8a7c2ea3762627 a867050932b372a211c6a4d8cd8a7c2ea3762627 2009-03-13T14:04:48-07:00 2009-03-13T14:04:48-07:00 Fixed #10488: fixed DB cache backend test failures in Oracle. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10051 bcc190cf-cafb-0310-a4f2-bffc1f526a37 31d03c4a1fd56ca9c00b967887818a54e8a800a5 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 1d574724a4805f66dc284117e0615917ab1da374 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/833fa46230c5b79dcd7cb5729fa4087668ad48ce 833fa46230c5b79dcd7cb5729fa4087668ad48ce 2009-03-13T12:57:00-07:00 2009-03-13T12:57:00-07:00 Fixed #10238: coerce TextField values to unicode in the oracle backend. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10049 bcc190cf-cafb-0310-a4f2-bffc1f526a37 70698210233fde9e6b6a88d5f792b5b63a1929ad ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 37ba382ec55ebfb1ccfe9ed924f4455a4681eaa0 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/1d574724a4805f66dc284117e0615917ab1da374 1d574724a4805f66dc284117e0615917ab1da374 2009-03-13T10:20:52-07:00 2009-03-13T10:20:52-07:00 Fixed a case where column aliases weren't being quoted properly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10048 bcc190cf-cafb-0310-a4f2-bffc1f526a37 1af64b43f8ed53bd76770e49f995634682ab3a89 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 6172df43efee9e1c39e9fd451d0a6769cf7f1658 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/37ba382ec55ebfb1ccfe9ed924f4455a4681eaa0 37ba382ec55ebfb1ccfe9ed924f4455a4681eaa0 2009-03-13T09:57:26-07:00 2009-03-13T09:57:26-07:00 Prevented InsertQuery from appending a 'RETURNING' clause when it's not actually interested in the result. This was causing some problems for Oracle. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10047 bcc190cf-cafb-0310-a4f2-bffc1f526a37 4b1915e83cc21e455326916b0ec45cfb9273abc9 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 5a64e37c564e7ebde6a01dea03d2b406d3cf91db adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/6172df43efee9e1c39e9fd451d0a6769cf7f1658 6172df43efee9e1c39e9fd451d0a6769cf7f1658 2009-03-12T21:45:11-07:00 2009-03-12T21:45:11-07:00 Improved the error message in case of an invalid DATABASE_BACKEND to ignore '.svn' directories in displaying the list of valid backends git-svn-id: http://code.djangoproject.com/svn/django/trunk@10046 bcc190cf-cafb-0310-a4f2-bffc1f526a37 3e4aa92dc878bce54b58a2259b16b228751cb12d adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 073dc355096f97f5f316ba110e2ccf5b48f6747f adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/5a64e37c564e7ebde6a01dea03d2b406d3cf91db 5a64e37c564e7ebde6a01dea03d2b406d3cf91db 2009-03-12T21:41:45-07:00 2009-03-12T21:41:45-07:00 Fixed #10487 -- Refactored the database-backend-selection logic into a function, django.db.load_backend. Thanks to Alex Gaynor for the initial patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@10045 bcc190cf-cafb-0310-a4f2-bffc1f526a37 de61c21fe56080ee662ecbf1708477ebdf5f6cb4 adrian adrian@bcc190cf-cafb-0310-a4f2-bffc1f526a37 8a871e95dc0170295c31dc90dc8edcb4989b2233 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/073dc355096f97f5f316ba110e2ccf5b48f6747f 073dc355096f97f5f316ba110e2ccf5b48f6747f 2009-03-12T16:41:27-07:00 2009-03-12T16:41:27-07:00 Fixed #10473: Added Oracle support for "RETURNING" ids from insert statements. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10044 bcc190cf-cafb-0310-a4f2-bffc1f526a37 38730389f785ef5b642118a821f802f6f1750987 ikelly ikelly@bcc190cf-cafb-0310-a4f2-bffc1f526a37 0d014df06f6bdfba880e8e2556e9882a0511b3be russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/8a871e95dc0170295c31dc90dc8edcb4989b2233 8a871e95dc0170295c31dc90dc8edcb4989b2233 2009-03-12T04:52:55-07:00 2009-03-12T04:52:55-07:00 Fixed #10250 -- Added a regression test to ensure that GROUP BY statements are correctly quoted under MySQL. This appears to have been corrected inadvertently since the original report, but the extra regression test will make sure it stays that way. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10043 bcc190cf-cafb-0310-a4f2-bffc1f526a37 1fb03135f0e7865de8d594093e0560eb240686d8 russellm russellm@bcc190cf-cafb-0310-a4f2-bffc1f526a37 7f017f387b65b83008bddb47986e1483bb25196c mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/0d014df06f6bdfba880e8e2556e9882a0511b3be 0d014df06f6bdfba880e8e2556e9882a0511b3be 2009-03-12T01:52:42-07:00 2009-03-12T01:52:42-07:00 Tweaked the dummy database backend initialisation. In order to report more comphrehensible tracebacks, remove the super() constructor call, since passing args to object.__init__ ends badly. So some subclassing possibilities are now removed, but it's the "dummy" backend, so we can make some compromises. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10042 bcc190cf-cafb-0310-a4f2-bffc1f526a37 23445f096863cc0d3bdec7e496d43eb8a4ca9437 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 a40b8e8c27812398d8c810f014003ff89dfb9e6f mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/7f017f387b65b83008bddb47986e1483bb25196c 7f017f387b65b83008bddb47986e1483bb25196c 2009-03-12T00:57:35-07:00 2009-03-12T00:57:35-07:00 Fixed a problem from r10036. Fixed #10470. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10040 bcc190cf-cafb-0310-a4f2-bffc1f526a37 520ac1551a8179c3632abf6761bb4e0c37c57e8a mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 fcde04c4c159579e8fb6a075845c7fea964a6df3 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/jezdez/django/commit/a40b8e8c27812398d8c810f014003ff89dfb9e6f a40b8e8c27812398d8c810f014003ff89dfb9e6f 2009-03-12T00:28:22-07:00 2009-03-12T00:28:22-07:00 Fixed #10472 -- Fixed a race condition in reverse URL resolving. This only shows up in for reverse() (not forwards resolving), since that path uses a globally shared resolver object. Based on a patch from Travis Terry. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10037 bcc190cf-cafb-0310-a4f2-bffc1f526a37 7ffa60c4d964baa62d7a2c650e97173691155201 mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37