xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1866 commits 31 branches 40 tags 3.8 GiB
Commit graph

40 commits

Author SHA1 Message Date
Dustin Johnson
55f7212a0e Issue #1543 Break apart the retrieval process to support SBN capabilities. 
Made interfaces for various aspects of retrieval that are Spring injectable.
Created an initial SBN retrieval task that will watch the /awips2/crawl directory, for proof of concept.

Amend:
  Check whether debug is enabled prior to debug message.
  Move log of request xml inside null check.

Change-Id: I5e3fe835f028cb93c98abce9735d3d59cfc663dc

Former-commit-id: cf063000ca [formerly 3b20efeb7d] [formerly cf063000ca [formerly 3b20efeb7d] [formerly 1a17e4a0f5 [formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: 2940a059d1 [formerly b5f69e21d8]
Former-commit-id: bef0f2eca1
 2013-02-04 09:00:33 -06:00
Dustin Johnson
64c335478a Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager 
Amend:
  Rebase to 13.2.1

Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81

Former-commit-id: c8302eb9f8 [formerly b0125d6d7e] [formerly c8302eb9f8 [formerly b0125d6d7e] [formerly 4e9ecdf166 [formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]]
Former-commit-id: 4e9ecdf166
Former-commit-id: a463f7ef2b [formerly 150c5275ca]
Former-commit-id: 6b46be5bc6
 2013-01-29 10:10:54 -06:00
Dustin Johnson
b15abf8279 Issue #1529 Disable menu items when no subscriptions selected 
Amend:
  Rebase to 13.2.1

Change-Id: I5265c1036bc31a87a8bacadfd7b3a9219922f073

Former-commit-id: 572733ff56 [formerly fc332a8b9a] [formerly 572733ff56 [formerly fc332a8b9a] [formerly e9ae4c62c1 [formerly 50a157e679cc16cc47653314d538738355aada49]]]
Former-commit-id: e9ae4c62c1
Former-commit-id: a5ecfa14a9 [formerly f6dfeb1823]
Former-commit-id: 2756a184f1
 2013-01-29 10:05:52 -06:00
Lee Venable
68d5562118 Merge "Issue #1533 Update the calculated dataset size after loading subset xml" into 13.2.1_delivery 
Former-commit-id: d5a0674873 [formerly 98f25434a9] [formerly d5a0674873 [formerly 98f25434a9] [formerly 21059af185 [formerly 4043ba3c71a85148bbd262fd5cd371c290b5bfd8]]]
Former-commit-id: 21059af185
Former-commit-id: 30ab7d00ff [formerly 18b96d33c6]
Former-commit-id: 66f7449b9c
 2013-01-29 10:00:37 -06:00
Dustin Johnson
4afc6cf363 Issue #1533 Update the calculated dataset size after loading subset xml 
Change-Id: I9fd94485bed113c68663484fb19daadcbe962a8d

Former-commit-id: 7dae10b701 [formerly 2c068589aa] [formerly 7dae10b701 [formerly 2c068589aa] [formerly 9f7e9692c2 [formerly 747395cffd90554eea099c05affe75487ec304a3]]]
Former-commit-id: 9f7e9692c2
Former-commit-id: 8a2ac02862 [formerly 0fe2711273]
Former-commit-id: ee324a8a28
 2013-01-28 12:47:45 -06:00
Dustin Johnson
7d73d0bd64 Issue #1528 Fix subscription priorities to be the same from domain object to GUI 
Fix incorrect use of enum ordinal value mappings to priorities.
Fix broken bandwidth priority scheduling.

Change-Id: Ic9e220966c20e95fcc3f81f0c647ffcdb2fcbca5

Former-commit-id: 50bfcd3fbf [formerly 41c0ff85ff] [formerly 50bfcd3fbf [formerly 41c0ff85ff] [formerly f88a5c1b95 [formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]]
Former-commit-id: f88a5c1b95
Former-commit-id: 4ab288ae75 [formerly 4465094fe9]
Former-commit-id: b78257ab11
 2013-01-25 14:30:04 -06:00
Mike Duff
df41fe4395 Issue #1357 - Remaining stats items implemented. 
Peer Review Fixes

Change-Id: I94d2e3fc08af2bef5e1e57c4ad7caf826e254ae1

Former-commit-id: 712862d96f [formerly ffca969560] [formerly 712862d96f [formerly ffca969560] [formerly 1bc6e7c2e4 [formerly 19e1608c44d314e11bb7cba809e1cc0a6bb68dc5]]]
Former-commit-id: 1bc6e7c2e4
Former-commit-id: dfcce57a0a [formerly 4cd7deb608]
Former-commit-id: ac9f95d1d0
 2013-01-23 11:17:36 -06:00
Mike Duff
a14438b10a Issue #1520 - Change delete notifications to hide. 
Remove accelerators

Change-Id: I2954c1324cbdf1bc4e5577925dbcd10e5faa6156

Former-commit-id: bbc998d372 [formerly ddcd0f8222] [formerly bbc998d372 [formerly ddcd0f8222] [formerly 8efd37da79 [formerly 0378ff80cc3592379ec3d49efc895adafa05109a]]]
Former-commit-id: 8efd37da79
Former-commit-id: 14bfeb0732 [formerly 243c1e15e9]
Former-commit-id: ad1c7c604d
 2013-01-23 09:14:48 -06:00
Dustin Johnson
4cec3d4356 Issue #1519 Fix max latency calculations for adhoc queries 
Amend:
  Peer review comments.

Change-Id: Ifa76b145616d8fdcf4ba41cd3744cfc3991b902c

Former-commit-id: 504268f0f3 [formerly 6c1818d544] [formerly 504268f0f3 [formerly 6c1818d544] [formerly f730422834 [formerly e9d88236907b98f7e461807592e580bdf1ecedb9]]]
Former-commit-id: f730422834
Former-commit-id: 2e09d46fea [formerly 516ac1ab9a]
Former-commit-id: 7918b009ff
 2013-01-23 08:06:52 -06:00
Dustin Johnson
87a442717b Merge "Issue #1501 Route notification requests to datadelivery." into 13.2.1_delivery 
Former-commit-id: 77923b1cef [formerly 84b6f0217f] [formerly 77923b1cef [formerly 84b6f0217f] [formerly 26e72198b7 [formerly 9fb35681ebe6d17679cd26cc86a53aeb357bcd3b]]]
Former-commit-id: 26e72198b7
Former-commit-id: a83bc7ce7f [formerly 821572355e]
Former-commit-id: c3cfb16075
 2013-01-22 11:47:03 -06:00
Dustin Johnson
7da688f138 Issue #1441 Create new datadelivery services plugin 
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.

Amend:
  Rebase to HEAD of 13.2.1.

Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa

Former-commit-id: 3ec05a5a9c [formerly 557de162b0] [formerly 3ec05a5a9c [formerly 557de162b0] [formerly 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]]
Former-commit-id: 15c2c55ff9
Former-commit-id: 756080321e [formerly a3c99f86bb]
Former-commit-id: 2168713505
 2013-01-22 11:45:18 -06:00
Dustin Johnson
cb174e731d Issue #1501 Route notification requests to datadelivery. 
Change-Id: Icde52bafb67e199caeb74ed0078c879ab514836b

Former-commit-id: cda7f4d592 [formerly d956891360] [formerly cda7f4d592 [formerly d956891360] [formerly 500f6050be [formerly 9550a861fab635a8f61c485152e27ec90ebb9cb2]]]
Former-commit-id: 500f6050be
Former-commit-id: a372963fb7 [formerly b4bb2ee454]
Former-commit-id: 2ab171b9ef
 2013-01-22 10:19:09 -06:00
Dustin Johnson
6314e94764 Issue #1501 Include subscription on activation/deactivation notification, remove race condition of table update. 
Change-Id: Ic3f8ff634136a9830cba42befc7f41c2554698aa

Former-commit-id: 94a0cd5733 [formerly 0281da10cc] [formerly 94a0cd5733 [formerly 0281da10cc] [formerly 2eda48aa0d [formerly dd07cad3e6b2471fc4371471918078498f05d01e]]]
Former-commit-id: 2eda48aa0d
Former-commit-id: 58b3edd7df [formerly c7189052e8]
Former-commit-id: 2df1cb5d53
 2013-01-21 21:24:48 -06:00
Ben Steffensmeier
c659ffb227 Issue #1495 add ensemble selection tab to subset dialog 
Change-Id: I71c599428285c9d394529a77359a4ba61dd88f15

Former-commit-id: d06ef00715 [formerly f0d1c1a737] [formerly d06ef00715 [formerly f0d1c1a737] [formerly 14f3c3b3bf [formerly e884c8e79f05af8fb3252fa7a492d232ba090715]]]
Former-commit-id: 14f3c3b3bf
Former-commit-id: 0ec9848c96 [formerly a28d09edbf]
Former-commit-id: 88dd263c34
 2013-01-18 15:42:08 -06:00
Ben Steffensmeier
cc33f33872 Issue #1495 enable ensemble subset requests in opendap. 
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a

Former-commit-id: 928cb3b00f [formerly eb821d7580] [formerly 928cb3b00f [formerly eb821d7580] [formerly 94ba8511cb [formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]]
Former-commit-id: 94ba8511cb
Former-commit-id: 41a0a0e4e4 [formerly 7e3b6d12f6]
Former-commit-id: 0232b77e85
 2013-01-18 14:58:10 -06:00
Dustin Johnson
1e4df6722c Issue #1501 Use registry version of subscription when sending notification responses 
Change-Id: I96622e8f1d2236ade47d4c5a11ad41b750bc7962

Former-commit-id: 9f775d2dd7 [formerly d9064bdc98] [formerly 9f775d2dd7 [formerly d9064bdc98] [formerly 38036a0e8b [formerly da8f6de9ae2b897163b465c045114fbd9ebec6e8]]]
Former-commit-id: 38036a0e8b
Former-commit-id: 9681f57fac [formerly 13a75fabad]
Former-commit-id: 6266e3e44c
 2013-01-17 14:53:36 -06:00
Mike Duff
fc87600adb Issue #1420 - More Rules changes. 
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 1df1b5a94d [formerly 2a31447d6d] [formerly 1df1b5a94d [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]
Former-commit-id: 8d0a79703f
Former-commit-id: 72a70a6eaf [formerly c6924b6920]
Former-commit-id: 7a750e72e3
 2013-01-16 14:34:55 -06:00
Brad Gonzales
beed5ad195 Issue #1452 Clear current filters when creating a new filter configuration. 
Change-Id: I7562e05f404b7b3bc746a168d72601520d3a8500

Former-commit-id: 5fd396acaf [formerly 026c98298b] [formerly 5fd396acaf [formerly 026c98298b] [formerly e7ecc52e25 [formerly c4f47262403a56a0e6fe28bb1b5ac523fb91e43f]]]
Former-commit-id: e7ecc52e25
Former-commit-id: 382a21f3a2 [formerly 253ac8f1d3]
Former-commit-id: 5693e82505
 2013-01-15 15:50:43 -06:00
Dustin Johnson
1070de3f2d Issue #1286 Fix bugs found during 1286 testing 
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 99f8d40bed [formerly 3d74a68e94] [formerly 99f8d40bed [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]
Former-commit-id: 2cf52d976b
Former-commit-id: 94e95f3e07 [formerly aa7acedf0a]
Former-commit-id: 5cd31fc0b7
 2013-01-15 10:18:14 -06:00
Brad Gonzales
7be1cf3631 Issue #1437 moved changes for ticket 1437 to the AWIPS2_baseline repository. 
Change-Id: I49b715f4b9f998e933948d3803194aa41deec979

Former-commit-id: 1644eee264 [formerly 5bbe5d5dbf] [formerly 1644eee264 [formerly 5bbe5d5dbf] [formerly 72cb336592 [formerly 9341aa5fe927e38db949be280a323300cd9fc62d]]]
Former-commit-id: 72cb336592
Former-commit-id: bd8eaa6dc8 [formerly 881cc10e84]
Former-commit-id: 063551fb18
 2013-01-14 14:47:51 -06:00
Ben Steffensmeier
1ffcc3ada2 Issue #1464 fix saving of spatial subsets. 
Former-commit-id: 0933461f40 [formerly bc5233748a] [formerly 0933461f40 [formerly bc5233748a] [formerly c8ef480815 [formerly 185311ebfda70bf29adb3898682f37ea55bca467]]]
Former-commit-id: c8ef480815
Former-commit-id: 053b673790 [formerly 4fd3d47385]
Former-commit-id: 244de069da
 2013-01-14 10:49:14 -06:00
Richard Peter
f0dcd53a2c Merge "Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state." into development 
Former-commit-id: 854bd1d4e0 [formerly d2a1388b0e] [formerly 854bd1d4e0 [formerly d2a1388b0e] [formerly 061fa21537 [formerly 888b839152d86c536b249e795666c596a213da86]]]
Former-commit-id: 061fa21537
Former-commit-id: fdf83d8623 [formerly 6176588496]
Former-commit-id: a82f86b26b
 2013-01-11 16:32:03 -06:00
Ben Steffensmeier
1d91b721d1 Issue #1464 fix spatial subset tab and modify area comp so it attempts to initialize to a valid state. 
Former-commit-id: 83cf6ec05c [formerly 5c5b2e3c20] [formerly 83cf6ec05c [formerly 5c5b2e3c20] [formerly 52f55e6d3a [formerly acb73f44d4cbea7f36419b1cb44bfff47e87c474]]]
Former-commit-id: 52f55e6d3a
Former-commit-id: 0a5da321d6 [formerly c617b3cc70]
Former-commit-id: 79d9115a7a
 2013-01-11 16:26:14 -06:00
Mike Duff
66dc038d02 Issue #1420 - Additional changes and cleanup 
Issue #1420 - remove commented out code, move method
Issue #1420 - fix for max latency
Change-Id: I8a983812e4fab7477659d7f175eaa005bb92f064

Former-commit-id: 329a010b07 [formerly 279729e88e] [formerly 329a010b07 [formerly 279729e88e] [formerly 8411a46e3e [formerly d69e77e9b902d164a5716e432f62bd99e1b784dd]]]
Former-commit-id: 8411a46e3e
Former-commit-id: d3ed6f6148 [formerly 950c71c164]
Former-commit-id: 772154de38
 2013-01-11 14:38:34 -06:00
Richard Peter
87b4521a69 Merge "Issue #1453 Fix handling of active period across year boundary" into development 
Former-commit-id: 58242a600c [formerly 32e5d79e7a] [formerly 58242a600c [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: cf815a4c72 [formerly d3df89181f]
Former-commit-id: a9f01d5846
 2013-01-11 12:37:05 -06:00
Richard Peter
23899a125f Merge "Issue #1346 - added addtional information to the data browser dataset details dialog" into development 
Former-commit-id: c309d2dc1e [formerly a595356025] [formerly c309d2dc1e [formerly a595356025] [formerly f9e39660d4 [formerly 410b7e917c48645ef1337b531e18bdb4cbe7fc4f]]]
Former-commit-id: f9e39660d4
Former-commit-id: ff1dc7e236 [formerly b9e409357d]
Former-commit-id: feeea305a9
 2013-01-11 12:25:54 -06:00
Dustin Johnson
ef31fc45a9 Issue #1453 Fix handling of active period across year boundary 
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: 3e1878c5f9 [formerly 7716f1baa9] [formerly 3e1878c5f9 [formerly 7716f1baa9] [formerly c4068d27bf [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]
Former-commit-id: c4068d27bf
Former-commit-id: a4414d409a [formerly 0b3f803f6c]
Former-commit-id: 9b3cf3308f
 2013-01-11 12:23:15 -06:00
Mike Duff
ad0f7088af Issue #1444 - Fix updating subsets by loading a saved subset from the saved subset tab. 
Change-Id: Ibc6b93fd8a9d7a9fdf07b28d77f4f32e706ae05a

Former-commit-id: 16a86f47e6 [formerly 35d73f0354] [formerly 16a86f47e6 [formerly 35d73f0354] [formerly 4cbe807a52 [formerly 843a771d3c6247326d1e832eb598072f7c313499]]]
Former-commit-id: 4cbe807a52
Former-commit-id: c498087b96 [formerly 98ec2a5269]
Former-commit-id: 855af43259
 2013-01-11 12:22:47 -06:00
Dustin Johnson
f269969791 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions 
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: 8473eb60fb [formerly 4ae1a9645c] [formerly 8473eb60fb [formerly 4ae1a9645c] [formerly 446f65776e [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]
Former-commit-id: 446f65776e
Former-commit-id: 7bf029eb7e [formerly 64ececeda1]
Former-commit-id: 6fb6bc8f87
 2013-01-11 11:53:02 -06:00
Richard Peter
9312478e41 Merge "Issue #1432 - Fix case sensative and exclude check boxes." into development 
Former-commit-id: 942140cca5 [formerly cffe035019] [formerly 942140cca5 [formerly cffe035019] [formerly e91b5bd035 [formerly 8da35969c383bb7d22e5f629859311d8783069dc]]]
Former-commit-id: e91b5bd035
Former-commit-id: c4c2ae3256 [formerly 6857211fc6]
Former-commit-id: 9492e77036
 2013-01-10 17:25:09 -06:00
Richard Peter
4552b5f71a Issue #1454: Update Dataset size calculation 
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 45e6e286bb [formerly deca70207d] [formerly 45e6e286bb [formerly deca70207d] [formerly 73263e270e [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]
Former-commit-id: 73263e270e
Former-commit-id: 4a097586f6 [formerly 69818573a6]
Former-commit-id: 49da28ead4
 2013-01-10 17:17:58 -06:00
Mike Duff
d23c9266d8 Issue #1432 - Fix case sensative and exclude check boxes. 
Former-commit-id: d2981a8275 [formerly 9526199a9c] [formerly d2981a8275 [formerly 9526199a9c] [formerly 78440f2b5a [formerly 29d620050a3b2aefd2b9eda664e3139e146558be]]]
Former-commit-id: 78440f2b5a
Former-commit-id: f2da1df6e6 [formerly bde6be532e]
Former-commit-id: ae8eecc95b
 2013-01-10 15:35:33 -06:00
Mike Duff
7b76dbba46 Issue #1346 - added addtional information to the data browser dataset details dialog 
Former-commit-id: 674ddfedb2 [formerly 02bfe05a27] [formerly 674ddfedb2 [formerly 02bfe05a27] [formerly b72c2e4b04 [formerly 682e4831f76b3a220aeedb9fc292886f24582e72]]]
Former-commit-id: b72c2e4b04
Former-commit-id: 8b23902cea [formerly b42395d6ea]
Former-commit-id: 910401bd23
 2013-01-10 12:26:59 -06:00
Mike Duff
660064ea6a Issue #1420 - Rules Peer review comments 
Former-commit-id: f41d525fa3 [formerly 4c63333a96] [formerly f41d525fa3 [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: ed95eae2e3 [formerly 67486aa43b]
Former-commit-id: 8313877a3a
 2013-01-09 12:02:21 -06:00
Richard Peter
920867e5cd Merge "Issue #1299 Log if invalid forecast index is requested" into development 
Former-commit-id: c29aad09b2 [formerly c138f7b351] [formerly c29aad09b2 [formerly c138f7b351] [formerly b43a21f4b5 [formerly 5eef3aa833a8940435fe965e060501e27a6c5eec]]]
Former-commit-id: b43a21f4b5
Former-commit-id: 27356fb873 [formerly 42848170a9]
Former-commit-id: 189254a1dc
 2013-01-08 16:48:09 -06:00
Richard Peter
6eed9166d7 Merge "Issue #1436 Fixed selection icon reset, Fixed area text box display check." into development 
Former-commit-id: 6b2edffd7e [formerly f25f22c569] [formerly 6b2edffd7e [formerly f25f22c569] [formerly 6a54b7f4d3 [formerly 26e37784cac5ffd690e7280aa394711a3bd86820]]]
Former-commit-id: 6a54b7f4d3
Former-commit-id: 7b4c0a6750 [formerly 34bc572bb9]
Former-commit-id: e97eead930
 2013-01-08 16:45:58 -06:00
Dustin Johnson
9368311f93 Issue #1299 Log if invalid forecast index is requested 
Change-Id: If550175be76c99a90acd228dc8f4542fb39ee644

Former-commit-id: 2e8172899c [formerly cb9a603da8] [formerly 2e8172899c [formerly cb9a603da8] [formerly d3f2a7a19e [formerly 30b3c809902e82b40855ddf31f2c6faecf59f861]]]
Former-commit-id: d3f2a7a19e
Former-commit-id: 8b42d8aa2e [formerly 004bad506d]
Former-commit-id: a06204192f
 2013-01-08 14:51:53 -06:00
Brad Gonzales
2dfc5f99c5 Issue #1436 Fixed selection icon reset, Fixed area text box display check. 
Change-Id: Ib7545ff9e23eadac26daf927ce428b805f3be4b2

Former-commit-id: 701c572625 [formerly c9c68424f9] [formerly 701c572625 [formerly c9c68424f9] [formerly a78c49e2b1 [formerly 4fb8c74153e6da96943cf6ee71b03f5c3ff73176]]]
Former-commit-id: a78c49e2b1
Former-commit-id: 21e8f98ee8 [formerly 5a5644a2c5]
Former-commit-id: 720a30f639
 2013-01-08 14:12:22 -06:00
Dustin Johnson
b24ddaeb4e Issue #1453 Fix the handling of subscription active period dates. 
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 1975cd0442 [formerly 6a90779214] [formerly 1975cd0442 [formerly 6a90779214] [formerly 2635e05723 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]
Former-commit-id: 2635e05723
Former-commit-id: 885f315d30 [formerly 492cee4992]
Former-commit-id: b1c159fc7f
 2013-01-08 12:44:29 -06:00
Bryan Kowal
1996f92f7e Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline 
Former-commit-id: ab8b346489 [formerly c8a43edd9e] [formerly ab8b346489 [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 6d7f57c62a [formerly 146c43a606]
Former-commit-id: 0136f9d5a3
 2013-01-07 12:16:01 -06:00