Dave Hladky
5346a31c5b
Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
...
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1
Former-commit-id: f7ccf2e765
[formerly a1c4148918
] [formerly 9b495681ec
] [formerly f7ccf2e765
[formerly a1c4148918
] [formerly 9b495681ec
] [formerly c57d5574ef
[formerly 9b495681ec
[formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]]
Former-commit-id: c57d5574ef
Former-commit-id: 19117f1851
[formerly 3ba473351b
] [formerly a513fe6a10c22c44c2f7c793a12913414d1f9b36 [formerly db207a732c
]]
Former-commit-id: fce61df1efff7105f52295e290f5cb6c3b74985f [formerly 5bf3f5f89f
]
Former-commit-id: 871c4718ab
2013-03-14 15:59:39 -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
Ron Anderson
0b86852e99
Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1
...
Former-commit-id: 1864ba24e5
[formerly 60af3ad63e
] [formerly 16d93dab84
] [formerly 1864ba24e5
[formerly 60af3ad63e
] [formerly 16d93dab84
] [formerly fc749ff3eb
[formerly 16d93dab84
[formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]]]
Former-commit-id: fc749ff3eb
Former-commit-id: c6598f3869
[formerly 97a38fd3c5
] [formerly cdf68ae1b9e656919543c5343fa44ed63c766ab2 [formerly 7087e1ebe7
]]
Former-commit-id: f83c5f140768ed2dd5877ad5d7e3a9d44e146b8a [formerly e6ba869694
]
Former-commit-id: bd0618d53f
2013-03-14 14:55:31 -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
Ben Steffensmeier
ad0078d2e9
Issue #1793 Performance improvements for TCMWindTool
...
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e
Former-commit-id: 3f0030521d
[formerly 7335a2336e
] [formerly 7aa8b2d3eb
] [formerly 3f0030521d
[formerly 7335a2336e
] [formerly 7aa8b2d3eb
] [formerly 45a5cffdf3
[formerly 7aa8b2d3eb
[formerly 055873318a368301fc966501b27001f5ace0bcae]]]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 55d80d760f
[formerly e5b9e0ca46
] [formerly 628065abbf3e3e03dedca4f091459d9085169d1c [formerly 364d6fd9ee
]]
Former-commit-id: 4fe3069a05c6bc069a0cd306a5134a66e8ba310c [formerly 153a7dbd7d
]
Former-commit-id: 41e3ac3923
2013-03-14 13:26:08 -05:00
Greg Armendariz
166fcb78a9
Removed merge code from the source code
...
Former-commit-id: 05d7892c3b
[formerly 2bb407ea8b
] [formerly 5511f0b3a6
] [formerly 05d7892c3b
[formerly 2bb407ea8b
] [formerly 5511f0b3a6
] [formerly 2f9136843b
[formerly 5511f0b3a6
[formerly 9652fe27ae424cba83296a714a720e554390550a]]]]
Former-commit-id: 2f9136843b
Former-commit-id: ef59159bb9
[formerly b79ecc28e3
] [formerly 486130740373c00d6c7a8808665421ce577a9b77 [formerly 3a3486b0b7
]]
Former-commit-id: 0fe252f9bf5b69a3471bb0b71197934ca6b0d155 [formerly 8ea2042456
]
Former-commit-id: cfc53af85e
2013-03-14 11:15:08 -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
Ben Steffensmeier
d74ac3e7f7
Issue #1777 fix subgridding range problems
...
Former-commit-id: 81f4bb55fc
[formerly 5e81f2154d
] [formerly 5bd20414eb
] [formerly 81f4bb55fc
[formerly 5e81f2154d
] [formerly 5bd20414eb
] [formerly 0daa5817d0
[formerly 5bd20414eb
[formerly bb518596c4b9ce06279e4b1e7fb841c63514ce62]]]]
Former-commit-id: 0daa5817d0
Former-commit-id: 964fc25677
[formerly d22cbc7ce9
] [formerly 3bef982b8d104b6bd033477b34c99e0da65ce9ad [formerly a6140145a4
]]
Former-commit-id: cf39e0dc082aed64da92558a4c063831fc9ebdb9 [formerly bc92e1be6b
]
Former-commit-id: 24b97d7625
2013-03-14 09:56:00 -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
Nate Jensen
f046b23f9b
Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1
...
Former-commit-id: 14da2b6cc3
[formerly 9dbb7660a7
] [formerly 29b4cd2fb5
] [formerly 14da2b6cc3
[formerly 9dbb7660a7
] [formerly 29b4cd2fb5
] [formerly 490ffe2772
[formerly 29b4cd2fb5
[formerly 086546a518276d519aca779d55c160f4f8bcd577]]]]
Former-commit-id: 490ffe2772
Former-commit-id: b74d6315a6
[formerly e2e9a845d5
] [formerly bb1674d56d5f72528a3f2eb6ea51452dfd9a36b1 [formerly a933532ad9
]]
Former-commit-id: 75207b52738316a6767eb046282fd34cc9c6c47c [formerly 363efaec00
]
Former-commit-id: c710def06d
2013-03-14 09:48:16 -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
Ben Steffensmeier
6b3e6e703b
Issue #1792 Improve performance of gfe parm time weighted average.
...
Change-Id: I139c873175ee1dbe29968c90e193701122abcead
Former-commit-id: dcf02199ea
[formerly a9695abb45
] [formerly 22624ba5d3
] [formerly dcf02199ea
[formerly a9695abb45
] [formerly 22624ba5d3
] [formerly 52c167cf00
[formerly 22624ba5d3
[formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]]]
Former-commit-id: 52c167cf00
Former-commit-id: a440445437
[formerly 2d622e6053
] [formerly 48609b58bd2286f625bd7a23b14b9741685a71df [formerly 8f6a7c0746
]]
Former-commit-id: e54de36cfb829c41843de14a87917d4b35e60c55 [formerly 60bb04a055
]
Former-commit-id: 7266a995f9
2013-03-13 18:52:52 -05:00
Ron Anderson
86d85d75e8
Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1
...
Former-commit-id: f9c7fa9613
[formerly 0c881b4a85
] [formerly 3b65608373
] [formerly f9c7fa9613
[formerly 0c881b4a85
] [formerly 3b65608373
] [formerly 61f74305e2
[formerly 3b65608373
[formerly 437a30971b299965540d47f572ad83cd0d7df120]]]]
Former-commit-id: 61f74305e2
Former-commit-id: 87cd340e38
[formerly de14cd0baa
] [formerly f55bb3e367547583c32d5cc1463941491ec9c6b6 [formerly a7b6e1689b
]]
Former-commit-id: 4487e4817e53af625104ab94ce05c0bd8071ba49 [formerly b1088415cd
]
Former-commit-id: 39e2d27a89
2013-03-13 17:16:37 -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
Ben Steffensmeier
1f4315a7ed
Issue #1791 Implement bulk getGrids to improve performance.
...
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74
Former-commit-id: a6a1d9bec7
[formerly 37bae0988b
] [formerly 4c150b0fd6
] [formerly a6a1d9bec7
[formerly 37bae0988b
] [formerly 4c150b0fd6
] [formerly 89eb902284
[formerly 4c150b0fd6
[formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]]]
Former-commit-id: 89eb902284
Former-commit-id: 7e998aa197
[formerly f5680beaa9
] [formerly 10a52ad4fbe4cb9ea324302c2ac6a32c3b3fad23 [formerly 7abf3cfb39
]]
Former-commit-id: f38c474fb547944154f869716e7a195f17c008a5 [formerly 6d699f7713
]
Former-commit-id: f012dd8b0a
2013-03-13 17:09:20 -05:00
Nate Jensen
f981b7b9b1
Merge "Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing." into omaha_13.3.1
...
Former-commit-id: 4db98f508d
[formerly d0db96df45
] [formerly dbd2729336
] [formerly 4db98f508d
[formerly d0db96df45
] [formerly dbd2729336
] [formerly eaef235e8e
[formerly dbd2729336
[formerly c9dc9e2a55f835e450b35cfe3408e03ab6ab8754]]]]
Former-commit-id: eaef235e8e
Former-commit-id: d7696aa692
[formerly 15b3d5add6
] [formerly 2d26b66cf912a53b86fda6b7e210470e522c1cbe [formerly d881ab1442
]]
Former-commit-id: 5e309f9fa3e25596f11809c78831943947e408ed [formerly 4539ef8b58
]
Former-commit-id: 165fbf3646
2013-03-13 16:17:44 -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
Dave Hladky
b111edeb8b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5
[formerly 765be278bb
] [formerly 38b952a220
] [formerly 7d2c1bc4d5
[formerly 765be278bb
] [formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2
[formerly 9e97fc9efe
] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8
]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8
]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Ben Steffensmeier
f5d83f4c32
Issue #1789 Move Calendar and Date parsing out of ConvertUtil and also fix date parsing.
...
Former-commit-id: 45cf2fd0ff
[formerly 51955a719a
] [formerly 36b3c16a42
] [formerly 45cf2fd0ff
[formerly 51955a719a
] [formerly 36b3c16a42
] [formerly ddf2092bde
[formerly 36b3c16a42
[formerly 9491a90efdb389372e3ff3c988eb19aac9d508b6]]]]
Former-commit-id: ddf2092bde
Former-commit-id: 6e0c60c210
[formerly a1ca2ae2d7
] [formerly 9ff9ba942dcb40894a6b2a25b30b686d76272ff6 [formerly 247c9f6c1f
]]
Former-commit-id: a9c09f254baa3c3e3c8f54b1f737da4393b40042 [formerly 04882c798f
]
Former-commit-id: 15a16c8d81
2013-03-13 13:21:16 -05:00
Steve Harris
352658125b
13.3.1-7 baseline
...
Former-commit-id: 23faf84455
[formerly 97d2f521e4
] [formerly a72254cc75
] [formerly 23faf84455
[formerly 97d2f521e4
] [formerly a72254cc75
] [formerly e12ed113ae
[formerly a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d
[formerly ed5f1dbab6
] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca
]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd
]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -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
Steve Harris
3b10c0e0b7
13.3.1-6.1 baseline
...
Former-commit-id: 3ea50babf5
[formerly 6d96471b9b
] [formerly fa9d260c2b
] [formerly 3ea50babf5
[formerly 6d96471b9b
] [formerly fa9d260c2b
] [formerly a062803c8c
[formerly fa9d260c2b
[formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]]]
Former-commit-id: a062803c8c
Former-commit-id: f92bc8f3d4
[formerly 2e1dbdc10d
] [formerly 38ded82c18c6e60a96a3dd85d4c9dd3d0ed218fe [formerly bfa25f3330
]]
Former-commit-id: c57d4dca8ae0fdf1532461d5c287fa8b8cb94434 [formerly c038384685
]
Former-commit-id: a5b96e0c3c
2013-03-13 08:28:26 -05:00
Roger Ferrel
cef241d8f8
Issue #1783 Modified DefaultPluginArchiveFileNameFormatter to use LinkList instead of ArrayList.
...
Change-Id: I156fc0f335320489923ae31f6e790f5e86ac26f4
Former-commit-id: 82b526851a
[formerly f912d9ece3
] [formerly c5a2786c84
] [formerly 82b526851a
[formerly f912d9ece3
] [formerly c5a2786c84
] [formerly b5743e8f9b
[formerly c5a2786c84
[formerly 8ec4ac592389af736c45a11d9c6f6613fd9da504]]]]
Former-commit-id: b5743e8f9b
Former-commit-id: b2845a11d0
[formerly a9a0a471f9
] [formerly b8373ea3e1f95cfdea39442e15da79444813af3c [formerly 8bb9044e3a
]]
Former-commit-id: a992232e6a449b734a792e862f3d7cf15e059841 [formerly 5546691fd6
]
Former-commit-id: cf7b0e99f7
2013-03-12 16:58:06 -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