Dustin Johnson
f10956964f
Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development
...
Former-commit-id: 1fb27b205a
[formerly 36cc80590c
] [formerly b7a5311dde
] [formerly 1fb27b205a
[formerly 36cc80590c
] [formerly b7a5311dde
] [formerly 7fe3c254fd
[formerly b7a5311dde
[formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]]]
Former-commit-id: 7fe3c254fd
Former-commit-id: b4c83331db
[formerly 7afc4a083b
] [formerly 9bd17f5ccc6a8fce1d466bbffddc89e3dcf31e69 [formerly 55095f0041
]]
Former-commit-id: f827fdbd3bb674e1c0ea6231337a8aa2c31c8ae0 [formerly 805c491c04
]
Former-commit-id: 225c664129
2013-03-15 16:14:17 -05:00
Nate Jensen
a8ef2c34ea
Merge "Issue #1638 Fixed Velocity templates for windows build" into development
...
Former-commit-id: ba81904ec9
[formerly cab8a23ebd
] [formerly f3fbae64b3
] [formerly ba81904ec9
[formerly cab8a23ebd
] [formerly f3fbae64b3
] [formerly d14dfe215c
[formerly f3fbae64b3
[formerly 640eb368b7026651de34db2154fb955930d65040]]]]
Former-commit-id: d14dfe215c
Former-commit-id: 5e8498d2db
[formerly 74df582fac
] [formerly a0d830224d381066b98e46fa05f68e7a3f50d428 [formerly 0191c8bff0
]]
Former-commit-id: f90587e4b50237f26b84468be8608b7fc5fd3d00 [formerly 7cae3e296e
]
Former-commit-id: 9bd1f201e3
2013-03-15 13:49:56 -05:00
Max Schenkelberg
11d5047ab8
Issue #1638 Fixed Velocity templates for windows build
...
Change-Id: I144825fc138f0064294f7d540b51f5cff7995a3a
Former-commit-id: 93c416e914
[formerly 07a6fd494d
] [formerly 2c3ee8d35d
] [formerly 93c416e914
[formerly 07a6fd494d
] [formerly 2c3ee8d35d
] [formerly beb801517e
[formerly 2c3ee8d35d
[formerly da9666be71adf84f394f255406a66afa6c3f28be]]]]
Former-commit-id: beb801517e
Former-commit-id: f294d9aa8a
[formerly c3232f2581
] [formerly 1728f5f643c879365568ae1dc33fadaaaaa596c0 [formerly 582de5717c
]]
Former-commit-id: 674a9be4dc2da4c1c061afd222692adb68d3eb79 [formerly af973ff5a6
]
Former-commit-id: 286fc9a6ec
2013-03-15 12:16:59 -05:00
Dustin Johnson
090d1fe72a
Issue #1794 Consolidate common filename filters into FilenameFilters class
...
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36
Former-commit-id: 65f87506b7
[formerly fff7e7983f
] [formerly ecb0d2c826
] [formerly 65f87506b7
[formerly fff7e7983f
] [formerly ecb0d2c826
] [formerly 43a9f608ef
[formerly ecb0d2c826
[formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]]]
Former-commit-id: 43a9f608ef
Former-commit-id: d8880e29b6
[formerly 7adf94e9f6
] [formerly 32cf95aeffa94b88b3254eb1bbd479d2d9247fa2 [formerly 1b82ad0dc4
]]
Former-commit-id: b520365a67b13e0f4c76818883c281e85883a6aa [formerly a08059dd34
]
Former-commit-id: 83034c3f43
2013-03-15 11:51:58 -05:00
Roger Ferrel
2c0583b153
Issue #1790 changes for non-blocking StationLegendDlg.
...
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d
Former-commit-id: 24868f7ed5
[formerly dadf8a9e4c
] [formerly 0089e24579
] [formerly 24868f7ed5
[formerly dadf8a9e4c
] [formerly 0089e24579
] [formerly b01bb935c3
[formerly 0089e24579
[formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]]]
Former-commit-id: b01bb935c3
Former-commit-id: dfbd824211
[formerly 382bb7c16b
] [formerly b11e4827ee12c6a982cc5d1a4fc3306a804a2efe [formerly 08990f97f8
]]
Former-commit-id: 145489302fb20481be73e31f21174de8ac97472a [formerly 85f58a9e52
]
Former-commit-id: ccc37c2b46
2013-03-15 10:26:30 -05:00
Roger Ferrel
c47f5629ee
Issue #1790 changes for non-blocking StaffGageDlg.
...
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092
Former-commit-id: 32ba1814f5
[formerly fcbda4e0de
] [formerly 4230e1a9b8
] [formerly 32ba1814f5
[formerly fcbda4e0de
] [formerly 4230e1a9b8
] [formerly 17a41bf063
[formerly 4230e1a9b8
[formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]]]
Former-commit-id: 17a41bf063
Former-commit-id: 3693e9dfeb
[formerly e88e52e406
] [formerly 183b27d474d2061440f4cf3fd19e327acad33523 [formerly 006062502e
]]
Former-commit-id: ac30a4dd7448f55c70b4f50a34021c66bc9b9343 [formerly 47dac77059
]
Former-commit-id: 1d2db27655
2013-03-15 09:00:00 -05:00
Roger Ferrel
08a01e5332
Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg.
...
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c
Former-commit-id: b6a18b2d96
[formerly 76507ebcc5
] [formerly 015fc9b8f8
] [formerly b6a18b2d96
[formerly 76507ebcc5
] [formerly 015fc9b8f8
] [formerly 34ea46099e
[formerly 015fc9b8f8
[formerly ad772f0a3eb944117614f029a2c3659e5c774599]]]]
Former-commit-id: 34ea46099e
Former-commit-id: 269127174c
[formerly 60e7b4be62
] [formerly 08234f862f3dd3950c644ed09abf867def44c3c1 [formerly 7eae71038f
]]
Former-commit-id: 732bd192282170bc35d3bb0a55c5ead58745fd44 [formerly 824b98527c
]
Former-commit-id: 5f0b405866
2013-03-15 08:17:50 -05:00
Roger Ferrel
69ecbd4f6f
Issue #1790 Changes for non-blocking TabularDisplayDlg.
...
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d
Former-commit-id: a19092d5c2
[formerly 818b856f97
] [formerly c43b7777e1
] [formerly a19092d5c2
[formerly 818b856f97
] [formerly c43b7777e1
] [formerly ebe57f1cbc
[formerly c43b7777e1
[formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]]]
Former-commit-id: ebe57f1cbc
Former-commit-id: cec76b08bf
[formerly 46428ed944
] [formerly a4411b7fa0720ced4d24e4567246f0516fe411f4 [formerly ff944b4768
]]
Former-commit-id: b1a23287bd793544df9c34418c58d4b414b4f70a [formerly 1cada5eec3
]
Former-commit-id: d8000c1526
2013-03-14 15:38:08 -05:00
Lee Venable
5b6fd448b7
Merge "Issue #1790 Changes for non-blocking PointDataControlDlg dialog." into development
...
Former-commit-id: f5f0b284d7
[formerly 966497c2a9
] [formerly 03f81c4f49
] [formerly f5f0b284d7
[formerly 966497c2a9
] [formerly 03f81c4f49
] [formerly 7c9ce3dfb9
[formerly 03f81c4f49
[formerly 27b25500f8346d73b0a12ca8597e7b0a6282ad0c]]]]
Former-commit-id: 7c9ce3dfb9
Former-commit-id: c0d412397c
[formerly 9125432046
] [formerly 546fc34b7d27513704c590425ed3208030340083 [formerly 21c657ce8a
]]
Former-commit-id: 0dfb17af7f7775aab85c96870445f57484417355 [formerly ecc0ee05a5
]
Former-commit-id: 093fcee46f
2013-03-14 13:44:15 -05:00
Bryan Kowal
2b8d1731af
Issue #1663 - updated libpq.so for the native hydro applications
...
The following commands were used to complete the update:
- tar -xpf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so*
- tar -pf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/libpq.so* --delete
- rm -fv ./edex/lib/native/linux32/*.so*
- cp -Pv /awips2/psql/lib/libpq*.so* ./edex/lib/native/linux32
- tar -uf i386-pc-linux-gnu.tar ./edex/lib/native/linux32/*.so*
Change-Id: I7315109880c4813ede4f9d87877bc3ddf20cb7f1
Former-commit-id: 4f62288851
[formerly 675e97b219
] [formerly 379e19e8a4
] [formerly 4f62288851
[formerly 675e97b219
] [formerly 379e19e8a4
] [formerly 28eb671ed0
[formerly 379e19e8a4
[formerly 2aed340ede1daa86607d7854cf48bba23dffaa61]]]]
Former-commit-id: 28eb671ed0
Former-commit-id: 9eddd7eca0
[formerly 6d0eb4f360
] [formerly 4e43458f686c895864df23ff40ffdfa68150f68d [formerly bfae338f1c
]]
Former-commit-id: b9a9088c8775111742dafda15bc4f749ddf8e850 [formerly 2a6e9e5069
]
Former-commit-id: 6448897ea8
2013-03-14 10:40:18 -05:00
Bryan Kowal
ff3b0b0645
Issue #1663 - name the default geometry column
...
Change-Id: Ibefa48fe9a295559a501e510f513f8ab77ceca27
Former-commit-id: f3835d85a0
[formerly b0d31729e8
] [formerly 0d33c86abe
] [formerly f3835d85a0
[formerly b0d31729e8
] [formerly 0d33c86abe
] [formerly 8c0ee91c5b
[formerly 0d33c86abe
[formerly 365f6dde01877efb9f75fa742f670420e30d07d5]]]]
Former-commit-id: 8c0ee91c5b
Former-commit-id: 21e0725cdc
[formerly ebaea489bc
] [formerly 59d9eafff7a1f7424f1ff366a16e0923edbc8e89 [formerly e83033b314
]]
Former-commit-id: 09091a45851f5017a3373897df85539afa1505f0 [formerly bc0c82dad8
]
Former-commit-id: a897e41993
2013-03-14 10:37:20 -05:00
Bryan Kowal
ce667ef7f5
Issue #1772 - remove references to the DEV_MODE jvm parameter
...
- removed ScriptLibraryManager.java
Change-Id: Ia373f431f0faac1020ee80962d20705bc3c6080e
Former-commit-id: 123f4a8de9
[formerly 19b26c9f04
] [formerly dd811f674b
] [formerly 123f4a8de9
[formerly 19b26c9f04
] [formerly dd811f674b
] [formerly 58316907ae
[formerly dd811f674b
[formerly 627fd3ccd5baa06d63f0e24b9824a5739d48e91a]]]]
Former-commit-id: 58316907ae
Former-commit-id: b4316f574e
[formerly 8c91869c8e
] [formerly 5a526894932882f5beada1042dc714d09a4e90c4 [formerly 86c287bb33
]]
Former-commit-id: e5013bbbea796da871243b85a1f893100b7f1a4e [formerly 39ff5c7945
]
Former-commit-id: 851eb395f7
2013-03-14 09:54:11 -05:00
Roger Ferrel
be6fbede98
Issue #1790 Changes for non-blocking PointDataControlDlg dialog.
...
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908
Former-commit-id: c6b64c828c
[formerly c556928998
] [formerly dae3fb5938
] [formerly c6b64c828c
[formerly c556928998
] [formerly dae3fb5938
] [formerly 62b241a548
[formerly dae3fb5938
[formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]]]
Former-commit-id: 62b241a548
Former-commit-id: 463545471a
[formerly 3baa2e9220
] [formerly 07c0e26a4def2d1580d95e8b371943bfc4d36663 [formerly 09f4c18b5c
]]
Former-commit-id: 8d6e588257e9d52dfb94bca386cf5faa7e817a20 [formerly d808a33c51
]
Former-commit-id: 80ee3e1d66
2013-03-14 08:22:05 -05:00
David Gillingham
c274c26346
Issue #1759 : Convert ifpnetCDF and iscMosaic to use more robust request
...
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.
Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152
Former-commit-id: e7a9930ee9
[formerly 87013aad89
] [formerly 7c74510723
] [formerly e7a9930ee9
[formerly 87013aad89
] [formerly 7c74510723
] [formerly 566927980a
[formerly 7c74510723
[formerly edaef1edf93ed7d7f626591ecfd86fb4c76f92e8]]]]
Former-commit-id: 566927980a
Former-commit-id: e79e4a7f7d
[formerly d8dd50f2ba
] [formerly 07b617a330b24e8266d4259815c46e96ac32f768 [formerly 90b8c80837
]]
Former-commit-id: 788c23cfd8404383ca37105cb8ff85c42e716b52 [formerly b121f99015
]
Former-commit-id: 34a1c7b784
2013-03-13 17:14:59 -05:00
Bryan Kowal
f1854dd760
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: 9e678feaf8
[formerly db02ab18ed
] [formerly 729bc9c4bb
] [formerly 9e678feaf8
[formerly db02ab18ed
] [formerly 729bc9c4bb
] [formerly 5e86ef080e
[formerly 729bc9c4bb
[formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]]]]
Former-commit-id: 5e86ef080e
Former-commit-id: 0b6a31d7ca
[formerly f6139755a5
] [formerly 916fa7115cb561d798c47318a5834ec0854bf491 [formerly 58e035a024
]]
Former-commit-id: 53b06b05ba798c5f2f0c58de3b9cd5f1c88b5850 [formerly 1e9054ce15
]
Former-commit-id: ea0950d836
2013-03-13 14:44:05 -05:00
Greg Armendariz
f60b305f53
Merge "Issue #1638 fix build" into development
...
Former-commit-id: 4f29b438ac
[formerly 28eec498f3
] [formerly cc168cb94c
] [formerly 4f29b438ac
[formerly 28eec498f3
] [formerly cc168cb94c
] [formerly a06a730696
[formerly cc168cb94c
[formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]]]
Former-commit-id: a06a730696
Former-commit-id: 065fb32918
[formerly f121df7e86
] [formerly 637e19f33ae49ff55331c55f304ac4387824f758 [formerly 12e912c548
]]
Former-commit-id: 1f3322859b5eb30167b2fc5873ed367c2801b6d4 [formerly 0e6e5cf53e
]
Former-commit-id: 85b7388ef6
2013-03-13 08:56:00 -05:00
Nate Jensen
6105ce4ddc
Issue #1638 fix build
...
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e
Former-commit-id: 84ea117d75
[formerly 975d044ba6
] [formerly 192fe9a724
] [formerly 84ea117d75
[formerly 975d044ba6
] [formerly 192fe9a724
] [formerly 1cbc7bbfdc
[formerly 192fe9a724
[formerly fe7a28034739ec871528f041cfa7a488e5c71378]]]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: 58cc71f75d
[formerly 5067a7b372
] [formerly f53aed250ff25cfca29a3a019820f483de4707c6 [formerly 733186900f
]]
Former-commit-id: 96929b6e6d7ce6e7469bb02ab01eac63ad777d7f [formerly e7658f710b
]
Former-commit-id: f9baf824cb
2013-03-13 08:50:26 -05:00
Dustin Johnson
3094780a1b
Issue #1784 Update ColorMapParameters import for ncep plugins
...
Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8
Former-commit-id: 4b9b444ef6
[formerly a5e0b421b5
] [formerly 9cd29d7625
] [formerly 4b9b444ef6
[formerly a5e0b421b5
] [formerly 9cd29d7625
] [formerly 0932affd16
[formerly 9cd29d7625
[formerly 884757847d855af099219c8ef2715a6319913646]]]]
Former-commit-id: 0932affd16
Former-commit-id: c971ba7c89
[formerly 9f81b57ec0
] [formerly dc78bf38c6ff41dd21542beb50a1f458f7032ab0 [formerly 64d8fc0ea3
]]
Former-commit-id: 0566aa3b124f2e7a7b29c2e2db789f3d6ecfc9c6 [formerly a63b1b96d6
]
Former-commit-id: d3b84af419
2013-03-13 08:45:54 -05:00
Dustin Johnson
71d6d82042
Issue #1784 Move NCF bandwidth manager code to data delivery repo
...
Amend:
Publish JUnit test reports as XML, in support of Jenkins.
Fix build/merge of 13.3.1 code so it compiles.
Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4
Former-commit-id: 2676e08fdd
[formerly 2983ed29e4
] [formerly 71365cd945
] [formerly 2676e08fdd
[formerly 2983ed29e4
] [formerly 71365cd945
] [formerly 1930183036
[formerly 71365cd945
[formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]]
Former-commit-id: 1930183036
Former-commit-id: fdaa9b5ce7
[formerly f5a3b57107
] [formerly 9459f282f836590ae975e73dd24d60edd299352a [formerly 48a96911c8
]]
Former-commit-id: 2ca9f41c1f96efae5c1b40855b28f7c73b8e3f8b [formerly 06b39b848b
]
Former-commit-id: be4fe08b9d
2013-03-13 08:39:08 -05:00
Nate Jensen
e2c7b0f918
Merge "Issue #1638 fix velocity on windows" into development
...
Former-commit-id: 33b73b008f
[formerly 37d996c64c
] [formerly 4486bd9941
] [formerly 33b73b008f
[formerly 37d996c64c
] [formerly 4486bd9941
] [formerly 676b3c9d11
[formerly 4486bd9941
[formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]]
Former-commit-id: 676b3c9d11
Former-commit-id: 8778e9f945
[formerly a4a5a1e94f
] [formerly 6bbc851111461bca4aabeb7be09dfa13233066b8 [formerly 33f185d021
]]
Former-commit-id: 5b75cd5f21c9b565338722888e0df16dec5de5d8 [formerly d0f70dafb3
]
Former-commit-id: 40d5631842
2013-03-12 16:43:13 -05:00
Nate Jensen
80ccca5828
Issue #1638 fix velocity on windows
...
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a
Former-commit-id: 48170212cb
[formerly 5e545cc9c4
] [formerly 863d4cf3df
] [formerly 48170212cb
[formerly 5e545cc9c4
] [formerly 863d4cf3df
] [formerly cbf0343d72
[formerly 863d4cf3df
[formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]]
Former-commit-id: cbf0343d72
Former-commit-id: f4b80d4b15
[formerly 35d0187e3d
] [formerly 86f6a376c5bb355801995427243a8f6c4288aac8 [formerly b00ccd2b77
]]
Former-commit-id: 3cc6c3a9b8804cff5c9f07d37b4eca224d0b9aba [formerly d8197235fe
]
Former-commit-id: 52139d5bcf
2013-03-12 16:04:59 -05:00
Steve Harris
072065191b
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java
Former-commit-id: 4c4c79036c
[formerly 36261cb095
] [formerly 753a5213ab
] [formerly 4c4c79036c
[formerly 36261cb095
] [formerly 753a5213ab
] [formerly 0cd7e56e65
[formerly 753a5213ab
[formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09
[formerly bca46a1354
] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015
]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa
]
Former-commit-id: 346b22b196
2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4
Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227
Former-commit-id: e17f8e0511
[formerly 5c65862b8f
] [formerly a1006667e0
] [formerly e17f8e0511
[formerly 5c65862b8f
] [formerly a1006667e0
] [formerly 4b08491880
[formerly a1006667e0
[formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b
[formerly 155903d135
] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de
]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13
]
Former-commit-id: cdfbcc7136
2013-03-12 15:48:34 -05:00
Dustin Johnson
325dcb693c
Merge "Issue #1778 Watch for bandwidth configuration changes" into development
...
Former-commit-id: f417e8fc5d
[formerly 13ce9b683d
] [formerly 11e7d3b511
] [formerly f417e8fc5d
[formerly 13ce9b683d
] [formerly 11e7d3b511
] [formerly 6a0a04a519
[formerly 11e7d3b511
[formerly f33c6cbe9c63721ec62f57b3953abd48729c8674]]]]
Former-commit-id: 6a0a04a519
Former-commit-id: 2e6dbfe4ce
[formerly f892ae71f7
] [formerly 8e43f9dfa2a910c3efb59ec13bc67a05d282b421 [formerly 4ec51a98d9
]]
Former-commit-id: e7b10b662ad170ec2603350a77c4099bb5295692 [formerly 2dde21a4bb
]
Former-commit-id: 833d616ab5
2013-03-12 12:15:50 -05:00
Dustin Johnson
f440fe5d75
Issue #1778 Watch for bandwidth configuration changes
...
Amend: Peer review comments
Change-Id: Idf4f70677a0ebb082e9cec986c9d17e60645751e
Former-commit-id: e358952f1f
[formerly 6eed493b3e
] [formerly 4c7f7801fa
] [formerly e358952f1f
[formerly 6eed493b3e
] [formerly 4c7f7801fa
] [formerly 794812fb23
[formerly 4c7f7801fa
[formerly ebc03ff41b450140ffa2bb6df44b128a75205a7b]]]]
Former-commit-id: 794812fb23
Former-commit-id: f3fb0e6fd2
[formerly d63cdbfd17
] [formerly 4f7ac3d05b747da63a956d1add39e97eccb9f98f [formerly 33fe353252
]]
Former-commit-id: 02ed92897102ecb414138fa1ec8a9d8802e0460f [formerly fbb8745ce5
]
Former-commit-id: 226be42368
2013-03-12 12:02:09 -05:00
Lee Venable
00986636ae
Merge "Issue #1760 - fix minutes on the y axis of 3 hour graph" into development
...
Former-commit-id: ac7a1d3ea6
[formerly 1285a3d4af
] [formerly c4c8d74cad
] [formerly ac7a1d3ea6
[formerly 1285a3d4af
] [formerly c4c8d74cad
] [formerly d68b5ac543
[formerly c4c8d74cad
[formerly 85970efae8002eb3f1773942211bd202014fecf2]]]]
Former-commit-id: d68b5ac543
Former-commit-id: 5b34278877
[formerly 25449b6fe0
] [formerly f7891989074b3e07fb1c34c466fb07b39f2a508d [formerly ed5ff858b4
]]
Former-commit-id: 47c3ee60ede36b1a49e7ebdf6a92c601f9f4e609 [formerly d221f217fc
]
Former-commit-id: f6b9a5c9eb
2013-03-12 11:33:17 -05:00
Mike Duff
369bcf9bd5
Issue #1760 - fix minutes on the y axis of 3 hour graph
...
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69
Former-commit-id: f5d8ba8b0f
[formerly a6eea1874b
] [formerly 714de645d5
] [formerly f5d8ba8b0f
[formerly a6eea1874b
] [formerly 714de645d5
] [formerly 7040daf472
[formerly 714de645d5
[formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]]]
Former-commit-id: 7040daf472
Former-commit-id: 7f42fb1818
[formerly a712efa614
] [formerly 079adc9e9487fc0c7120ff74f0179911f122086a [formerly b5bccd0bb2
]]
Former-commit-id: 764d29b6985f93b6a7d0e60026ca97f56f0983bf [formerly db2d5db8d9
]
Former-commit-id: fd06d11e25
2013-03-12 11:25:05 -05:00
Mike Duff
c36bf7c0bb
Issue #1646 - Format the output
...
Change-Id: I2cf00e194fdb65f37c4c0e2763140bfcc4f46ed6
Former-commit-id: 6f79d5e8f9
[formerly 75b6040ff6
] [formerly d1d694e1db
] [formerly 6f79d5e8f9
[formerly 75b6040ff6
] [formerly d1d694e1db
] [formerly ec0d814aa6
[formerly d1d694e1db
[formerly bdda0e529ccab13fab63e08330b3dcfcef330318]]]]
Former-commit-id: ec0d814aa6
Former-commit-id: 143518e10b
[formerly f1f79fc498
] [formerly d13b8b6dfbbd86c4ce3c55b81a092585ba5836e0 [formerly 7fbc376ec4
]]
Former-commit-id: d57ff218de791088a838336fae653b02cff79f4b [formerly 5ed9b7b6d0
]
Former-commit-id: 360da06974
2013-03-12 10:42:13 -05:00
Lee Venable
514a102281
Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1
...
Former-commit-id: 13d13428b7
[formerly 9a69cd3524
] [formerly d5af1f02c5
] [formerly 13d13428b7
[formerly 9a69cd3524
] [formerly d5af1f02c5
] [formerly 28d74d91b0
[formerly d5af1f02c5
[formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]]]
Former-commit-id: 28d74d91b0
Former-commit-id: da5ff93f57
[formerly b471e3807f
] [formerly 6cbbc7b35f1af06bc44a23c6f7846a7c829b25b7 [formerly e080fb5106
]]
Former-commit-id: 32365b9858d2738c4e5f0d906fdad1561c7cc170 [formerly b0e9ea9157
]
Former-commit-id: ca95cb0fce
2013-03-12 09:08:44 -05:00
Mike Duff
d69f849739
Issue #1781 - Fix Hydro Time Series slow table loads
...
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d
Former-commit-id: 5704b2689e
[formerly 492cf0f7e6
] [formerly 6a6844fdaf
] [formerly 5704b2689e
[formerly 492cf0f7e6
] [formerly 6a6844fdaf
] [formerly cac9bd6119
[formerly 6a6844fdaf
[formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]]]
Former-commit-id: cac9bd6119
Former-commit-id: 848f7982d6
[formerly 2df046d409
] [formerly b852cff98c7943089d4fa9240397aef285faa297 [formerly caed059e23
]]
Former-commit-id: 5c6d69dbb036423dd0841051c987f711a3b18320 [formerly 659a2a4f4c
]
Former-commit-id: 3eef80b3d1
2013-03-12 09:03:08 -05:00
Steve Harris
ed1788343e
13.3.1-6 baseline
...
Former-commit-id: 4eef6862d6
[formerly 2e110bd151
] [formerly 3a4c7931e1
] [formerly 4eef6862d6
[formerly 2e110bd151
] [formerly 3a4c7931e1
] [formerly 566b677d09
[formerly 3a4c7931e1
[formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171
[formerly 6fe4b16924
] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b
]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a
]
Former-commit-id: c28f3aeb02
2013-03-12 08:35:45 -05:00
Roger Ferrel
590ef32dcb
Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: 0982485efe
[formerly 70bd9aafa7
] [formerly 4deb731bd0
] [formerly 0982485efe
[formerly 70bd9aafa7
] [formerly 4deb731bd0
] [formerly b421c97d86
[formerly 4deb731bd0
[formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]]]
Former-commit-id: b421c97d86
Former-commit-id: 7c6bd5aeb0
[formerly 0deb290c24
] [formerly bfbd6592633352c9799a573f7b550fe350361788 [formerly 334f2c4a57
]]
Former-commit-id: 67c6f245a3e7e1a735bd5bfb5bb69221fe9e622b [formerly 0bbe51355e
]
Former-commit-id: 241dfb9451
2013-03-11 13:00:44 -05:00
Roger Ferrel
21a51d1177
Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server.
...
Code review changes 3.
Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c
Former-commit-id: c0ee394e9c
[formerly a73687c1b8
] [formerly 6744238fce
] [formerly c0ee394e9c
[formerly a73687c1b8
] [formerly 6744238fce
] [formerly 9e8472bab6
[formerly 6744238fce
[formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]]]
Former-commit-id: 9e8472bab6
Former-commit-id: 47fa3496fb
[formerly 7e5bb824d9
] [formerly ff76a88839c216a130eb0e8c4e251734c7719b17 [formerly 3684c7efed
]]
Former-commit-id: 7d566628343e1351cf48eeae57d0064db1054178 [formerly a8436c76ad
]
Former-commit-id: 408663b2b4
2013-03-11 11:16:22 -05:00
Lee Venable
9ca8522cb6
Merge "Issue #1769 Crashing FFMP caused by thread wait" into omaha_13.3.1
...
Former-commit-id: ed477e891e
[formerly 483e2813ac
] [formerly ea6731947e
] [formerly ed477e891e
[formerly 483e2813ac
] [formerly ea6731947e
] [formerly 41c7be5267
[formerly ea6731947e
[formerly 784852cf5045a32f94ba1923e9fadcd952d45dbb]]]]
Former-commit-id: 41c7be5267
Former-commit-id: ec43f5c022
[formerly be87f2adc3
] [formerly 3c83441ba78cd8de0509b446bbd7dc77463041fe [formerly 32221a7a7a
]]
Former-commit-id: 87ebea077e5297b6128366d2b0766faf4274c391 [formerly 330f2e0dd7
]
Former-commit-id: 8feb08beec
2013-03-08 13:04:28 -06:00
Dave Hladky
b2fd11f9ba
Issue #1769 Crashing FFMP caused by thread wait
...
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611
Former-commit-id: b064d868db
[formerly 50696bee89
] [formerly 2a854d7c30
] [formerly b064d868db
[formerly 50696bee89
] [formerly 2a854d7c30
] [formerly bb4c54eff0
[formerly 2a854d7c30
[formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]]
Former-commit-id: bb4c54eff0
Former-commit-id: f3c5756522
[formerly dd446abd03
] [formerly 0d693e1163a146ba4b75d08a7448f53b6d3a905b [formerly 73c21a6ead
]]
Former-commit-id: 35b46b23858ef8b9902cb3226539169a92f27a31 [formerly 6fe48593f0
]
Former-commit-id: a24150df56
2013-03-08 09:58:17 -06:00
David Gillingham
6ee51ed3f4
Issue #1759 : Refactor PurgeGfeGridsRequestHandler and IscMakeRequestHandler to not use
...
GfeScriptExecutor and GfeScript.
Change-Id: If3c789549a071e54f9020433f6221e688c51c44a
Former-commit-id: d10e4ea50b
[formerly 6b695c6a5e
] [formerly 4459ecfa78
] [formerly d10e4ea50b
[formerly 6b695c6a5e
] [formerly 4459ecfa78
] [formerly 1518c0b53c
[formerly 4459ecfa78
[formerly a3918b30452a829a8f0cd562021959246bf1144a]]]]
Former-commit-id: 1518c0b53c
Former-commit-id: 479817d4b9
[formerly b0665586e1
] [formerly 9c35b6e62f71cecd6862d09dd8e1e3d7b5002ee7 [formerly 251da90765
]]
Former-commit-id: c75c09b6b654fc13f4b8a85e7c12d08f1e5bdb9c [formerly 87d4bdd646
]
Former-commit-id: bfb26f70e6
2013-03-07 17:25:14 -06:00
Nate Jensen
c3eee1d672
Issue #1773 log publish times
...
Change-Id: I01817b8cd416dab37ff8bcb406e450d46a442a85
Former-commit-id: 8a5ebbb9c9
[formerly 5d9778a8d6
] [formerly 5e3d6df7e0
] [formerly 8a5ebbb9c9
[formerly 5d9778a8d6
] [formerly 5e3d6df7e0
] [formerly 5c59a61cef
[formerly 5e3d6df7e0
[formerly 392feade3f36680edcdb135f7c061be172210c26]]]]
Former-commit-id: 5c59a61cef
Former-commit-id: 5f343a50ae
[formerly 21863c5db5
] [formerly 5effcf2be10b9fa355b692253b6dde537d5459c4 [formerly d7902aba68
]]
Former-commit-id: cee6519ae8def3eb8dd9176022e583ac56b8f782 [formerly a2f804350a
]
Former-commit-id: d0bed867b0
2013-03-07 16:49:40 -06:00
Dustin Johnson
aa0da01a76
Issue #1647 Write out data targeted for the SBN as hidden, then rename
...
Change-Id: I5ea684eb0f3bfa4a97dfdb65b8d50b3774c8760e
Former-commit-id: 1b06171fe2
[formerly 84642b4f33
] [formerly 959e7e39d3
] [formerly 1b06171fe2
[formerly 84642b4f33
] [formerly 959e7e39d3
] [formerly 2a6edae82b
[formerly 959e7e39d3
[formerly 71229a6b442ed3a6fc92b2603c2d90507528d495]]]]
Former-commit-id: 2a6edae82b
Former-commit-id: 6ca0a3be57
[formerly f808444d6b
] [formerly 57f1a82ea88b02646a149c875b50c38e17bab65b [formerly e5670ffdb4
]]
Former-commit-id: dd21ec50a2800f695f380b19bf457ecc3ebdd826 [formerly d9585dd27e
]
Former-commit-id: e1625d40ba
2013-03-07 14:39:34 -06:00
David Gillingham
4310a7cf4c
Issue #1447 : Implement active table fetching, make bug fixes
...
to active table sharing from testing.
Change-Id: I84a3ed28f2cc8bdce0248faef984a4453d734c0d
Former-commit-id: c30aefd889
[formerly 75e82d9fca
] [formerly 95f8074c97
] [formerly c30aefd889
[formerly 75e82d9fca
] [formerly 95f8074c97
] [formerly 0a79d08dd8
[formerly 95f8074c97
[formerly cede300be734c8a05f90b9c84372866d9bd4f695]]]]
Former-commit-id: 0a79d08dd8
Former-commit-id: 266c316c9c
[formerly 94bccc87a3
] [formerly 34ef93fbfd1261df01dfa61865a606e7d9a7141f [formerly 5ad72e2a7f
]]
Former-commit-id: 28bcfe11ee679ce82c9ad55130e0004161f87c56 [formerly 2ca8e5e42a
]
Former-commit-id: a1029acb7c
2013-03-06 14:23:00 -06:00
Nate Jensen
68ad66710b
Issue #1753 log on user shutdown
...
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549
Former-commit-id: 2a34c5757a
[formerly f101934a30
] [formerly a7e9cfdb39
] [formerly 2a34c5757a
[formerly f101934a30
] [formerly a7e9cfdb39
] [formerly 163f93019b
[formerly a7e9cfdb39
[formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]]
Former-commit-id: 163f93019b
Former-commit-id: 97172b7466
[formerly c4175c161f
] [formerly 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30
]]
Former-commit-id: 11c882caee37b0a404c2eafec38954769365f319 [formerly 63eb6e6d21
]
Former-commit-id: 4a53109fb2
2013-03-06 09:36:00 -06:00
Jonathan Sanchez
b17c66eddc
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: edd4d9e02b
[formerly 80ea3e1ec2
] [formerly 8f70214f66
] [formerly edd4d9e02b
[formerly 80ea3e1ec2
] [formerly 8f70214f66
] [formerly 6a3281c878
[formerly 8f70214f66
[formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]]]
Former-commit-id: 6a3281c878
Former-commit-id: a5478559bc
[formerly 234d73c905
] [formerly 3d49dc5085631dccfa4591b739f0f1e02b09ecee [formerly c2b021427b
]]
Former-commit-id: 20722369ae623501820dc3acb6a7289596f69a5b [formerly 1403713fab
]
Former-commit-id: 852b61f7e1
2013-03-05 16:02:47 -06:00
Lee Venable
e5a6b3a349
Merge "Issue #1600 Created a utility class for adjust angles." into development
...
Former-commit-id: 90856bb929
[formerly 06462c5706
] [formerly 3929ef49cd
] [formerly 90856bb929
[formerly 06462c5706
] [formerly 3929ef49cd
] [formerly 1854e71f8a
[formerly 3929ef49cd
[formerly 52672b8ce9f9f28f707f7f6c1cd7ff61845ab752]]]]
Former-commit-id: 1854e71f8a
Former-commit-id: 4b6524a13f
[formerly 19686f12cc
] [formerly 06ba91c2e51936955ea3581ac6896f7a67b1ecd0 [formerly 0fc8bcc119
]]
Former-commit-id: 858b78c2472f5be5089d494380776b89da001d95 [formerly ce4d65e163
]
Former-commit-id: 5e1f35aef2
2013-03-05 15:37:18 -06:00
Jonathan Sanchez
43699636a2
Issue #1600 Created a utility class for adjust angles.
...
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: f79907bf9f
[formerly 3fface264c
] [formerly 1a91fe52e7
] [formerly f79907bf9f
[formerly 3fface264c
] [formerly 1a91fe52e7
] [formerly 1f2db32448
[formerly 1a91fe52e7
[formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]]]
Former-commit-id: 1f2db32448
Former-commit-id: 0917628d1a
[formerly 40f52ab049
] [formerly 51bec9541946d539bda749f417d6c93398a63eb9 [formerly 42bcef0be0
]]
Former-commit-id: bd9d63ecabb49e6cbdc69ab06ee9bafbea502490 [formerly 0caae30f26
]
Former-commit-id: b24d6fa352
2013-03-05 15:05:19 -06:00
Dustin Johnson
5bdda4c3d0
Merge "Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks" into development
...
Former-commit-id: d12fad8225
[formerly def94b337f
] [formerly 2262872d2d
] [formerly d12fad8225
[formerly def94b337f
] [formerly 2262872d2d
] [formerly 90b18cc477
[formerly 2262872d2d
[formerly fdb6fdd88c80e1f9d33c5d0b72aca389910599ed]]]]
Former-commit-id: 90b18cc477
Former-commit-id: 77371116fb
[formerly ec0e13e509
] [formerly b6f23cffe21aeb20de3ce78ef9031fe3a7c65e5c [formerly c28f99971c
]]
Former-commit-id: fc9e0c26772cd03119bc2a5a7d5be529fdf9b7f7 [formerly e6fb231413
]
Former-commit-id: 9346a14482
2013-03-05 15:01:02 -06:00
Dustin Johnson
a0635b7972
Merge "Issue #1752 - Lock down user admin dialog" into omaha_13.3.1
...
Former-commit-id: cfae194f9b
[formerly 21abece1f2
] [formerly d4c6c29f5f
] [formerly cfae194f9b
[formerly 21abece1f2
] [formerly d4c6c29f5f
] [formerly 3eddb2d286
[formerly d4c6c29f5f
[formerly 6fd60728a421630cea913d11db02b48f7940554e]]]]
Former-commit-id: 3eddb2d286
Former-commit-id: 513f990a00
[formerly b88a1eefc1
] [formerly 0344c84d1e8fbcb57eb5b9ad89e040c20ba5273c [formerly bfed4555a2
]]
Former-commit-id: 2791098ecadf0bba6ab4f7ece1617303c52f766e [formerly f6431b52bf
]
Former-commit-id: d28ff6d3c2
2013-03-05 13:32:04 -06:00
Steve Harris
b64731872c
Merge branch 'omaha_13.3.1' into development
...
Former-commit-id: afd934db35
[formerly 6b13492420
] [formerly d5b80f9225
] [formerly afd934db35
[formerly 6b13492420
] [formerly d5b80f9225
] [formerly aa0e9acefd
[formerly d5b80f9225
[formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 1709c34b8f
[formerly 4a0b8772ec
] [formerly 6d472393251484c670223cabe82285a18503dc7c [formerly b9563da8a8
]]
Former-commit-id: ad6ef96c444820a88fa41f79cf60d91bc2c26386 [formerly 46d0c9fcee
]
Former-commit-id: 2b489e4e40
2013-03-05 12:29:44 -06:00
Steve Harris
2104c8b533
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
...
Former-commit-id: 3ec20c1689
[formerly 61a19a460b
] [formerly 305dd72969
] [formerly 3ec20c1689
[formerly 61a19a460b
] [formerly 305dd72969
] [formerly 57f42761d7
[formerly 305dd72969
[formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]]]
Former-commit-id: 57f42761d7
Former-commit-id: 7ff64bf8cc
[formerly b423579e4a
] [formerly 3ba12429d361c6540fa79a3a73c1e6b40b39ba2c [formerly a8e1557c62
]]
Former-commit-id: 276acc0cf2f69b884f078f338890570213eec929 [formerly b630339eb7
]
Former-commit-id: d842ed88a7
2013-03-05 12:27:49 -06:00
Richard Peter
9d627eaa36
Merge "Issue #1750 - edexBridge will now set the QPID persistence flag" into development
...
Former-commit-id: 23075edfa7
[formerly a077fe35b5
] [formerly a44ee67d00
] [formerly 23075edfa7
[formerly a077fe35b5
] [formerly a44ee67d00
] [formerly 993f4ff2bd
[formerly a44ee67d00
[formerly 8a29ff0890d07e02623e67dacd08d506c7c85d3a]]]]
Former-commit-id: 993f4ff2bd
Former-commit-id: c8d658324c
[formerly 4cd4aae773
] [formerly e77d60d1d4f03fa95fedca47bc3e115337ae5cc4 [formerly 11afc055c5
]]
Former-commit-id: 0064e21982d3846ca96504a88f63a8a3dcaababa [formerly af26a571ad
]
Former-commit-id: 2e440ec073
2013-03-05 12:10:31 -06:00
Dustin Johnson
25efd81e23
Issue #1647 Apply WMO header, increase frequency of bandwidth manager tasks
...
Change-Id: Idcd9cc06543582252ddbabe42d7c30cb741dfbdd
Former-commit-id: 9cbd54fb43
[formerly 2bd62ad4b6
] [formerly 8107f76d98
] [formerly 9cbd54fb43
[formerly 2bd62ad4b6
] [formerly 8107f76d98
] [formerly 547780f9a3
[formerly 8107f76d98
[formerly ec1ed5a20e1aca5761fd0ed62b450a8fa6f70ecc]]]]
Former-commit-id: 547780f9a3
Former-commit-id: 17a3c88acd
[formerly 8c99bc1f17
] [formerly 90ec3431ba959280681cdc1016aef6fcf5421ea5 [formerly 043f122356
]]
Former-commit-id: 5995c0d49e8632dcdbd98fa104d9d26a0a175eda [formerly 13db762ae2
]
Former-commit-id: 5464463722
2013-03-05 11:39:42 -06:00
Mike Duff
f82462f4a0
Issue #1752 - Lock down user admin dialog
...
Change-Id: I4df2626ffe24ef11b9ff7b404a884a8223d72cbb
Former-commit-id: ec9f3ea4a1
[formerly 9d99eea617
] [formerly 6809cb6f80
] [formerly ec9f3ea4a1
[formerly 9d99eea617
] [formerly 6809cb6f80
] [formerly 193cf1e54f
[formerly 6809cb6f80
[formerly e43718de9e5b0f73e4168c724f82eb021e616a34]]]]
Former-commit-id: 193cf1e54f
Former-commit-id: e71d15f640
[formerly af84910ac6
] [formerly 88e4de072ccfa6a5ea0a83518e7661b27952c198 [formerly 775a0e3edd
]]
Former-commit-id: 15970d6c6fe94c1254b7558008541bf4e76fa5b3 [formerly 78953a3fd7
]
Former-commit-id: ffbc3e4b9f
2013-03-05 11:26:54 -06:00