Mike Duff
0cc0145076
Issue #2193 - Fix for DD data browser subscription column.
...
Change-Id: I1a76cdac15273b2e1b5b76095d9ae5f3ece8c1a3
Former-commit-id: 0ad0821d1c
[formerly 0ad0821d1c
[formerly 344193f08e3ced288cd223a0ae295d13aa50e13a]]
Former-commit-id: 8229d5a23f
Former-commit-id: 4495425388
2013-07-18 14:30:39 -05:00
Max Schenkelberg
a47f187f4f
Issue #2142 Got log4j out of edex.
...
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: 63421a4819
[formerly 63421a4819
[formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 50825200a1
Former-commit-id: 1610826d2e
2013-07-15 14:26:15 -05:00
Dustin Johnson
273928f386
Issue #2106 Create SubscriptionRetrievalAttributes to only load Subscription objects when required
...
Amend: Peer review comments, also fixed bug where subscriptions weren't being loaded on changing bandwidth
Change-Id: I8b5a122b0434d54dcfcbff9df6283edad68d7eb1
Former-commit-id: 050b38fa9a
[formerly 050b38fa9a
[formerly 4da045d4c13a7d14cdbea3269409f2020e0c78f1]]
Former-commit-id: 5f38365571
Former-commit-id: 6992ae7a11
2013-07-12 09:01:05 -05:00
Dustin Johnson
41ca04fcbd
Merge "Issue #2106 Improve BandwidthManager performance - Use copy constructors - Separate BandwidthBucket handling into a DAO - Preparations to remove all in-memory object handling" into development
...
Former-commit-id: f5d66a9f0d
[formerly f5d66a9f0d
[formerly 1a45a8604e35d0b14caf8465905a806e79a2461d]]
Former-commit-id: 59c1cd7a5e
Former-commit-id: 4db95fa534
2013-07-08 15:53:15 -05:00
Dustin Johnson
84e6eb6c8d
Issue #2106 Improve BandwidthManager performance
...
- Use copy constructors
- Separate BandwidthBucket handling into a DAO
- Preparations to remove all in-memory object handling
Amend: Copy more calendar and byte array objects
Change-Id: I72f4813c0780586585409a9a64c7915adc1ccbae
Former-commit-id: 124edcbd15
[formerly 124edcbd15
[formerly e11242447c3c93f403cd546df4315381486e465c]]
Former-commit-id: a6575c3235
Former-commit-id: 11a1972265
2013-07-08 10:22:30 -05:00
Mike Duff
3e20961fe0
Issue #2132 - review comments
...
Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094
Former-commit-id: 4399429e74
[formerly 4399429e74
[formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]
Former-commit-id: 2618c1a4e4
Former-commit-id: 82d713083a
2013-07-02 16:08:37 -05:00
Dustin Johnson
c2ed1495ad
Issue #2106 Fix transactional semantics
...
- No longer continuously suspend/resume transactions caused by invoking static methods
- Mark registry top-level query/store classes as requiring existing transactions
- Invoke registry initialized listeners in their own transaction
- Data changes denoted by registry events are now visible when the transaction commits
Change-Id: Ic78cbf00afc93aa5fcf1357000ea6c8b5e32cea9
Former-commit-id: fac7d3a9d9
[formerly fac7d3a9d9
[formerly 8d1a47446927a3c6646fa0748d7096afb376b952]]
Former-commit-id: 69c09e530f
Former-commit-id: f67d02a394
2013-06-25 08:33:55 -05:00
Mike Duff
a8a4393c82
Issue #2132 - Fix drawing lat/long box for madis point data
...
Change-Id: Ie041c31726f6e51467b9d2730d662c431b42ac96
Former-commit-id: f685e73bd2
[formerly f685e73bd2
[formerly 380b50d8a3d2a3f80e5a69dd1980e8e863985c2a]]
Former-commit-id: 14bd577f6c
Former-commit-id: 65faaadc7c
2013-06-21 14:59:03 -05:00
Steve Harris
316d2ec667
Merge branch 'omaha_13.5.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: 43316cbff9
[formerly 43316cbff9
[formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]
Former-commit-id: 532d41787b
Former-commit-id: cb3e34813f
2013-06-17 15:29:01 -05:00
Dustin Johnson
ae0ad86a89
Issue #2106 Correct connection password logic, fix test code
...
Change-Id: I6f7f91542c324ac63214da5e231ab3f267b90f25
Former-commit-id: e1fb1488c9
[formerly e1fb1488c9
[formerly e1098a65c04a230590b8460b3da1d12b1046b9b5]]
Former-commit-id: 6cb4800e24
Former-commit-id: 57be281cb4
2013-06-17 09:24:07 -05:00
Dustin Johnson
52b0821df6
Merge "Issue #2106 Speed up Bandwidth Manager subscription scheduling" into development
...
Former-commit-id: f6d907556b
[formerly f6d907556b
[formerly 14156b01cb7e4e4250c9e74f4e21116ab9c706b0]]
Former-commit-id: 4f655f8690
Former-commit-id: 8d7a800600
2013-06-14 10:33:48 -05:00
Dustin Johnson
4735212532
Issue #2106 Speed up Bandwidth Manager subscription scheduling
...
Change-Id: Iafceeb64a2b56c562ca737ba083ec3225524f7ba
Former-commit-id: 2574f5a25d
[formerly 2574f5a25d
[formerly 693bfd77ddc216e658f6e1e4a38f48a2df1fe3bf]]
Former-commit-id: 8500856bc1
Former-commit-id: b3cad4e40b
2013-06-14 09:25:48 -05:00
Dave Hladky
6f5039cb43
Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763 , #2062 for 13.6.1
...
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03
Former-commit-id: 776bbbba21
[formerly 776bbbba21
[formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]
Former-commit-id: 5512104d86
Former-commit-id: b401764a23
2013-06-13 22:13:49 -05:00
Dustin Johnson
f6b7d97fd2
Issue #2038 Correct required size estimations for subscription updates
...
Change-Id: I7994cb1492a4a541b6fe4720179fe928b3365db0
Former-commit-id: 9156ec8c2d
[formerly 9156ec8c2d
[formerly 2fb575c534a756a835cc072429ba78a417d3c445]]
Former-commit-id: 94eeac2f7d
Former-commit-id: c227436a3e
2013-06-12 14:52:49 -05:00
Dustin Johnson
b56641d370
Issue #2038 Add support for point data type subscriptions to BandwidthManager
...
Amend: Peer review comments, improve time considerations for Point subscriptions
Change-Id: I9dde7f7da9dab9c8f3163a87b1ebe64303fc7dc2
Former-commit-id: 7c4a6261fc
[formerly 7c4a6261fc
[formerly f7ed3ec86188635eb069878ac490af06ea98e4a2]]
Former-commit-id: c677ae32d7
Former-commit-id: 3ec421b779
2013-06-10 11:37:37 -05:00
Mike Duff
98d413f51b
Issue #2064 - Add ability to subscribe to observational point data (MADIS)
...
Change-Id: I298af2d50ec972ab4e728c7aa5d41c0a757d39fa
Former-commit-id: 321209adb8
[formerly 321209adb8
[formerly 9142ab024fb870b6c9fa18d42d42ae869c4ec58c]]
Former-commit-id: 12e5155edc
Former-commit-id: 5e7ec92696
2013-06-05 12:06:58 -05:00
Dave Hladky
1e55f4ade2
Issue #2062 Fixed up AWIPS2_baseline portion of merge
...
Change-Id: I3e327ee6789bf13357ff54c0843ce21a04bc870b
Former-commit-id: 2f67b74318
[formerly 2f67b74318
[formerly 982daef280be6f3efe87a066fa5919be9cfeb9ec]]
Former-commit-id: fa8ea8ecca
Former-commit-id: 9d2ec44182
2013-05-31 15:27:45 -05:00
Dustin Johnson
62131327ed
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: fc807288a7
[formerly fc807288a7
[formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]
Former-commit-id: 05bd3e113d
Former-commit-id: 42d1d74b04
2013-05-31 09:29:44 -05:00
Dave Hladky
8c0c235087
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 1608d407d1
[formerly 1608d407d1
[formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]
Former-commit-id: 83dae4fe01
Former-commit-id: 90e6d184e7
2013-05-30 17:04:16 -05:00
Dustin Johnson
94c4247617
Issue #2038 Fix deleting of multiple subscription types
...
Update test Spring configurations
Change-Id: I63a6d12b03768223a86c1a309bc438758bb61f2e
Former-commit-id: d2d50e7d8b
[formerly d2d50e7d8b
[formerly a862a4d1b9b34b3f93e54480b9fc482a234db918]]
Former-commit-id: ecf3f2e300
Former-commit-id: 151df64a6e
2013-05-29 15:54:06 -05:00
Dustin Johnson
1fab733472
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: 0a9e7ed740
[formerly 0a9e7ed740
[formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]
Former-commit-id: 31e01a9f9a
Former-commit-id: 187a1e49ef
2013-05-29 09:02:47 -05:00
Mike Duff
53ca005836
Issue #2020 - Implement Shared Subscriptions Cave-side.
...
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf
Former-commit-id: 192ce891d0
[formerly 192ce891d0
[formerly 1e00c7f935cf22ac5064060069164af6044f2150]]
Former-commit-id: b6b01c3e81
Former-commit-id: a9004667b7
2013-05-24 09:20:55 -05:00
Benjamin Phillippe
d9b5511b8b
Issue #1802 Implemented ebxml registry replication
...
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531
Former-commit-id: 120906de78
[formerly 120906de78
[formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]
Former-commit-id: ec69cdeb44
Former-commit-id: c0099a8a39
2013-04-12 11:27:45 -05:00
Dustin Johnson
b61292ce4d
Issue #1826 Remove delivery/notify options for subscriptions
...
Change-Id: Ife37bb70a5b54c3602d5f73de337cb83f37a9509
Former-commit-id: 11fd2d676b
[formerly 11fd2d676b
[formerly 0bf00ff025ea916aeb0ee4cb093163cbd9cfe931]]
Former-commit-id: 6bc69df127
Former-commit-id: b78f56f1ca
2013-04-09 11:40:25 -05:00
Dustin Johnson
fefc0dca3b
Issue #1841 Split up PendingSubscription hierarchy in support of shared subscriptions.
...
Add ability to store/approve shared subscriptions.
Back out generics on subscription/pending subscriptions until guis are updated.
Change-Id: I84e1651ebcad0d398396752529981f28dbc341bf
Former-commit-id: 61346b1388
[formerly 61346b1388
[formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]
Former-commit-id: f3bdede2c8
Former-commit-id: 8c52cd190f
2013-04-05 12:41:02 -05:00
Dustin Johnson
15ed8a6f58
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: c981b7250f
[formerly c981b7250f
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: 6129d86be4
Former-commit-id: dd8f4d8454
2013-04-01 15:35:51 -05:00
Dave Hladky
64f8c46e64
Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!
...
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d
Former-commit-id: ddb23ae59f
[formerly ddb23ae59f
[formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: f0244f54a4
2013-03-19 13:08:14 -05:00
Steve Harris
f3c3191a1c
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: a0573644c4
[formerly a0573644c4
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Steve Harris
b3b56830b0
13.3.1-1 baseline
...
Former-commit-id: 71e8990021
[formerly 71e8990021
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Dustin Johnson
5ffa5f410e
Issue #1543 Use separate RetrievalPlan configurations for NCF and WFO
...
- Change new registry modes to explicitly list includes/excludes.
- Add separate bandwidth manager creation capabilities for NCF and WFO.
- Add deltaScript to add a "route" slot to subscriptions.
- Remove unnecessary schemas from Spring files.
Change-Id: If3d4d310166bb6a201e191e0480d25829d25bcfa
Former-commit-id: d8659e742e
[formerly d8659e742e
[formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]
Former-commit-id: c8760e5699
Former-commit-id: ca721863be
2013-02-20 10:42:51 -06:00
Dustin Johnson
f6257b20ea
Issue #1543 Use XML to represent retrieval
...
- Only include request identifier for serialized retrieval data
- RetrievalAttributes are now retrieved from the database
- Remove plugin data objects from class names
- Add retrievalDao to retrieval task constructor
Amend:
Add call-through method to prepare for serialization.
Change-Id: Ic5d2243dd77e1aefd49057a0b7843329e95f0c9d
Former-commit-id: 437a168b50
[formerly 437a168b50
[formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]
Former-commit-id: 62a84aea76
Former-commit-id: db3a9d8f19
2013-02-18 13:05:41 -06:00
Steve Harris
0c128dd8f0
13.2.1-6 baseline
...
Former-commit-id: d0752de66c
[formerly d0752de66c
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Dustin Johnson
bef0f2eca1
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: 3b20efeb7d
[formerly 3b20efeb7d
[formerly 120296239cfa021507b4ce9bc3f7333509b1dfb9]]
Former-commit-id: 1a17e4a0f5
Former-commit-id: b5f69e21d8
2013-02-04 09:00:33 -06:00
Ben Steffensmeier
703fa6695e
Issue #1495 add ensemble to Subscription copy constructor
...
Former-commit-id: d17afdc1fa
[formerly d17afdc1fa
[formerly 9f7a3f505048009e076b81c2be9603cefe62577a]]
Former-commit-id: 5db16973bd
Former-commit-id: daf368ef21
2013-01-29 13:42:01 -06:00
Dustin Johnson
6b46be5bc6
Issue #1530 Do not allow partial scheduling of subscriptions in BandwidthManager
...
Amend:
Rebase to 13.2.1
Change-Id: Ied72baede3691957cf1155e1986428d1bfd16e81
Former-commit-id: b0125d6d7e
[formerly b0125d6d7e
[formerly 902feab2b1bdf0ffdadce76847ee76b9a8c7061e]]
Former-commit-id: 4e9ecdf166
Former-commit-id: 150c5275ca
2013-01-29 10:10:54 -06:00
Lee Venable
b2cd64020d
Merge "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." into 13.2.1_delivery
...
Former-commit-id: 06900ccbb7
[formerly 06900ccbb7
[formerly 19229d6f4fc871d462e8460c02bfb69975e7dada]]
Former-commit-id: f98e5b35e1
Former-commit-id: fb942ec7c2
2013-01-29 09:59:59 -06:00
Dustin Johnson
b78257ab11
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: 41c0ff85ff
[formerly 41c0ff85ff
[formerly b6dbc5f3117832ce8bda1698043d7941398f11b1]]
Former-commit-id: f88a5c1b95
Former-commit-id: 4465094fe9
2013-01-25 14:30:04 -06:00
Dave Hladky
e968417c2a
Issue #1527 Fix 0 Degree Isotherm displays For Data Delivery Grids
...
Change-Id: I326a25c3608d934d1b0183f2ad34109ab68e59f8
Former-commit-id: b1dddd37a6
[formerly b1dddd37a6
[formerly d29ebdf1323d836b2f1e254cdcb1da06fdb5da61]]
Former-commit-id: 04a955ff53
Former-commit-id: 2e396e04f7
2013-01-25 10:58:22 -06:00
Steve Harris
547c1dedd1
13.2.1-2 baseline
...
Former-commit-id: 83e9157df7
[formerly 83e9157df7
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Dustin Johnson
2168713505
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: 557de162b0
[formerly 557de162b0
[formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]]
Former-commit-id: 15c2c55ff9
Former-commit-id: a3c99f86bb
2013-01-22 11:45:18 -06:00
Ben Steffensmeier
0232b77e85
Issue #1495 enable ensemble subset requests in opendap.
...
Change-Id: I5c74b23f6c5c31b397855f102ee08f9c5737ac1a
Former-commit-id: eb821d7580
[formerly eb821d7580
[formerly ddaf9e6c69221600deedfbaf991a3936d0bb711e]]
Former-commit-id: 94ba8511cb
Former-commit-id: 7e3b6d12f6
2013-01-18 14:58:10 -06:00
Dustin Johnson
5cd31fc0b7
Issue #1286 Fix bugs found during 1286 testing
...
Amend:
Add time domain code.
Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2
Former-commit-id: 3d74a68e94
[formerly 3d74a68e94
[formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]
Former-commit-id: 2cf52d976b
Former-commit-id: aa7acedf0a
2013-01-15 10:18:14 -06:00
Dustin Johnson
9b3cf3308f
Issue #1453 Fix handling of active period across year boundary
...
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272
Former-commit-id: 7716f1baa9
[formerly 7716f1baa9
[formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]
Former-commit-id: c4068d27bf
Former-commit-id: 0b3f803f6c
2013-01-11 12:23:15 -06:00
Dustin Johnson
6fb6bc8f87
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: 4ae1a9645c
[formerly 4ae1a9645c
[formerly 797f570e28086b43b5d851275fba457c5920f57e]]
Former-commit-id: 446f65776e
Former-commit-id: 64ececeda1
2013-01-11 11:53:02 -06:00
Richard Peter
49da28ead4
Issue #1454 : Update Dataset size calculation
...
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5
Former-commit-id: deca70207d
[formerly deca70207d
[formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]
Former-commit-id: 73263e270e
Former-commit-id: 69818573a6
2013-01-10 17:17:58 -06:00
Dustin Johnson
b1c159fc7f
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: 6a90779214
[formerly 6a90779214
[formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]
Former-commit-id: 2635e05723
Former-commit-id: 492cee4992
2013-01-08 12:44:29 -06:00
Bryan Kowal
0136f9d5a3
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: c8a43edd9e
[formerly c8a43edd9e
[formerly b535a90fb25287945485c10b3c85749c11285171]]
Former-commit-id: d6b4cb65f4
Former-commit-id: 146c43a606
2013-01-07 12:16:01 -06:00