Steve Harris
4f155a183a
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: 64744fdb19
[formerly a0573644c4
] [formerly 2641d578e2
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Bryan Kowal
b2a0a7c148
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 519ce2c0fb
[formerly a8fb04f41c
] [formerly 803397c7c7
[formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]
Former-commit-id: 803397c7c7
Former-commit-id: 450e8e7a4c
2013-02-21 13:55:28 -06:00
Nate Jensen
533deac8d0
Merge "Issue #1628 clean up Inflaters used by HttpClient." into development
...
Former-commit-id: b2f7cbcbe3
[formerly 7dbeeb2684
] [formerly c6896b5676
[formerly 2a67f7f061b0be3740846a2b5cc2dc50403c05cf]]
Former-commit-id: c6896b5676
Former-commit-id: 4f4932b014
2013-02-21 11:47:00 -06:00
Nate Jensen
6f9d3f55e5
Merge "Issue #1635 Second Guidance source verification, general cleanup" into development
...
Former-commit-id: 033b9e3852
[formerly a9c4e54287
] [formerly 73f53bd513
[formerly 25ecfc3e6199294275abc8547c482388c55be724]]
Former-commit-id: 73f53bd513
Former-commit-id: d7a57d2b34
2013-02-21 11:41:52 -06:00
Steve Harris
0569ff413d
13.3.1-1 baseline
...
Former-commit-id: 96768407a5
[formerly 0563d7ac18
] [formerly cabc8cf8b4
[formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
2013-02-21 09:36:59 -05:00
Steve Harris
e4435815c9
13.3.1-1 baseline
...
Former-commit-id: 8ae397085e
[formerly 71e8990021
] [formerly d2a654625f
[formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Dustin Johnson
f552967bf3
Merge "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." into development
...
Former-commit-id: b6602f9468
[formerly a9e976eed8
] [formerly cb1380af90
[formerly 1d4453fdcdfd5c34d943f1a595a31820fedd133c]]
Former-commit-id: cb1380af90
Former-commit-id: 5031ae4d66
2013-02-20 16:17:20 -06:00
Dave Hladky
261d00c544
Issue #1635 Second Guidance source verification, general cleanup
...
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526
Former-commit-id: e7993c968d
[formerly 7b36b055f1
] [formerly 41f2ea7efe
[formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
2013-02-20 16:13:08 -06:00
Ben Steffensmeier
0f1057cb3d
Issue #1628 clean up Inflaters used by HttpClient.
...
Former-commit-id: 0e9226b5f5
[formerly ef2dd2a031
] [formerly e2efad85fe
[formerly 765b3b00362cbe9a5d6c3e392e005b42d968d268]]
Former-commit-id: e2efad85fe
Former-commit-id: 2debab14f5
2013-02-20 12:58:13 -06:00
Roger Ferrel
e47c91eda7
Issue #1636 Changes to TimeTools to allow file timestamp pattern to allow option hour; and WarningDecoder.py now uses TimeTools.
...
Change-Id: Iac6a4453c06d571f9462db9074b81434e1b5f45f
Former-commit-id: acfccac971
[formerly 8baa3b6df5
] [formerly dd05bc65be
[formerly daf6856b324b4a7ff66622cd3d61e800fe5518d8]]
Former-commit-id: dd05bc65be
Former-commit-id: 8264adc47d
2013-02-20 12:09:26 -06:00
Dustin Johnson
5a8b6459d4
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: d4afef2cab
[formerly d8659e742e
] [formerly c8760e5699
[formerly 10775068a3e54d8b48b1da4a3e8a6d952ec9c0ee]]
Former-commit-id: c8760e5699
Former-commit-id: ca721863be
2013-02-20 10:42:51 -06:00
Ben Steffensmeier
cde7275a2a
Issue #1598 fix GridParamInfo keys.
...
Former-commit-id: 7d4b065a23
[formerly 1ab9f7bd1f
] [formerly c1b8ceecf1
[formerly 33da1c48a76b468b9fee4e05de835295c7393672]]
Former-commit-id: c1b8ceecf1
Former-commit-id: 48e6ffe392
2013-02-19 14:06:26 -06:00
Steve Harris
81f1fb83a0
Merge branch 'omaha_13.2.1' (13.2.1-8) into development
...
Former-commit-id: c2327ce33d
[formerly ea50a5db77
] [formerly d123c044c3
[formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]
Former-commit-id: d123c044c3
Former-commit-id: 1c08acab38
2013-02-19 12:22:00 -06:00
Dustin Johnson
5ff6387368
Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes
...
Amend:
Use ref syntax with uri.
Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062
Former-commit-id: 2a588688b1
[formerly cc598094fa
] [formerly 116809346b
[formerly 66fe560026848357ae165a675be9818da719675d]]
Former-commit-id: 116809346b
Former-commit-id: 3585482cad
2013-02-18 15:47:17 -06:00
Richard Peter
d42a0b9f0d
Merge "Issue #1598 Make GridParamInfoLookup filter on extension. Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744" into development
...
Former-commit-id: 83d12549bf
[formerly 77157e3c6c
] [formerly f364af584d
[formerly 7b223be1a91cd67792d43865514867e6a12dfa7f]]
Former-commit-id: f364af584d
Former-commit-id: 623020926e
2013-02-18 15:36:41 -06:00
Dustin Johnson
6f94c035e8
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: f16c1507d0
[formerly 437a168b50
] [formerly 62a84aea76
[formerly 2cd0aa465fe10282b4be9225011fa8c780204edb]]
Former-commit-id: 62a84aea76
Former-commit-id: db3a9d8f19
2013-02-18 13:05:41 -06:00
Ben Steffensmeier
47090eccc1
Issue #1598 Make GridParamInfoLookup filter on extension.
...
Change-Id: I6f045d8cdd7233b767f5403e56ec364737d73744
Former-commit-id: efc1335b1f
[formerly 63a725718d
] [formerly d2e17d1473
[formerly f89bef237373fd2c7f6bb5b7490ee6aa63d2040b]]
Former-commit-id: d2e17d1473
Former-commit-id: 5ada0b2c2a
2013-02-18 10:36:47 -06:00
Richard Peter
4f3d9ab931
Merge "Issue #1584 - FFMP performance stats and performance logger Peer review comments Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c" into development
...
Former-commit-id: 3c126b0ab1
[formerly 355e6d2c67
] [formerly 4fb1cb27dc
[formerly a07a434ad71986aa4b474dd88e266035e347efa4]]
Former-commit-id: 4fb1cb27dc
Former-commit-id: 8991c1c86d
2013-02-18 09:35:53 -06:00
Steve Harris
8cffb55371
13.2.1-8 baseline
...
Former-commit-id: 18da2e93d7
[formerly f81b382c04
] [formerly 053156f02e
[formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Nate Jensen
d39e16e532
Merge "Issue #1614 Cache LatLonReprojection results. Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338" into development
...
Former-commit-id: eb8e87dfe2
[formerly 88b665c09a
] [formerly 52a0673961
[formerly cb57fe31471693b2f3398d0c6bd97af36410d9b8]]
Former-commit-id: 52a0673961
Former-commit-id: d648e77fa5
2013-02-18 09:07:18 -06:00
Steve Harris
58bafc0068
13.2.1-8 baseline
...
Former-commit-id: da707ff25c
[formerly 27d88edcb9
] [formerly 535a9402a7
[formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
2013-02-18 09:23:06 -05:00
Mike Duff
3e59308771
Issue #1584 - FFMP performance stats and performance logger
...
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c
Former-commit-id: 897262630c
[formerly 0b044dba9c
] [formerly 9c1e0ab639
[formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
2013-02-18 08:16:57 -06:00
Richard Peter
774ea0ede6
Merge "Issue #1608 Fixed group deletes in H5pyDataStore.py" into development
...
Former-commit-id: b3e2ca7b30
[formerly a40ae4d8b2
] [formerly a6fa92923f
[formerly 46302aa76056b00ee6a21c8080274ba23d92dcda]]
Former-commit-id: a6fa92923f
Former-commit-id: 5936f671ce
2013-02-15 16:33:00 -06:00
Ben Steffensmeier
5b1acfdeb3
Issue #1614 Cache LatLonReprojection results.
...
Change-Id: If1a8499fbb6a06bad41867078da3e957738f4338
Former-commit-id: a10e7edaeb
[formerly e53416937e
] [formerly feb2e98e58
[formerly 2596b3105e377f0fb8713be502a41b4b2f470e93]]
Former-commit-id: feb2e98e58
Former-commit-id: 6b53511f9e
2013-02-15 14:24:22 -06:00
Brad Gonzales
1501ed6deb
Issue #1615 Changed radar header names to match other header names.
...
Change-Id: I6b3be3028a1602ead03ec209e773db68bbfb665a
Former-commit-id: 1ddcd8b3a8
[formerly a9012633a1
] [formerly 961f51e91f
[formerly b7f5d565bdfb8f1289f73837ffa9a54f2659d65c]]
Former-commit-id: 961f51e91f
Former-commit-id: 0dda5f784e
2013-02-15 14:02:03 -06:00
Nate Jensen
d6ba283efc
Merge "Issue #1614 Refactor data access framework to use single request. Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798" into development
...
Former-commit-id: 1b1e468e1f
[formerly f748815e22
] [formerly f79f7db348
[formerly 55acd96d99a61170cbbc2b202e9562912b6fb0c3]]
Former-commit-id: f79f7db348
Former-commit-id: a60cf277bc
2013-02-15 11:56:11 -06:00
Ben Steffensmeier
91bbdc3337
Issue #1614 Refactor data access framework to use single request.
...
Change-Id: Id3ed7afcf79dfb2ddeca1d9c2b632f90cc44d798
Former-commit-id: e771076275
[formerly 1393f3e3cf
] [formerly 0933a5f596
[formerly 5a9ae7df15633492b0d9fb648876cfb2bb2946b6]]
Former-commit-id: 0933a5f596
Former-commit-id: f0f3c71d50
2013-02-15 11:39:56 -06:00
Ron Anderson
d69d628450
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: dc7c9edb87
[formerly a2a89fb4e7
] [formerly 7c0a5d74bf
[formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Richard Peter
ad4110a73f
Merge "Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging." into development
...
Former-commit-id: dcd4761b54
[formerly eb00310ef9
] [formerly b54ec2b59e
[formerly b3c7458333b9a8d0f011614c0b4845397e074ce8]]
Former-commit-id: b54ec2b59e
Former-commit-id: 0bab06709b
2013-02-15 08:44:02 -06:00
Richard Peter
015b51082d
Merge "Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType." into development
...
Former-commit-id: bd91d2b8be
[formerly 5a5a5ba855
] [formerly d905313941
[formerly 7071c075ee2282b6048cafdefac6d6c83a344ca0]]
Former-commit-id: d905313941
Former-commit-id: 2d8327e76f
2013-02-15 08:31:33 -06:00
Dustin Johnson
d0ecd69456
Issue #1596 Do not reschedule bandwidth allocations when a subscription is removed
...
Change-Id: I4016034e6bdc5e8acf4936a0f786906611e7ad41
Former-commit-id: 4be6c12ac6
[formerly 714ea1c8d8
] [formerly 6e2f69939f
[formerly 5f87319abc3712667abc6b454f49882b0f3fb45f]]
Former-commit-id: 6e2f69939f
Former-commit-id: 1ef440f8ee
2013-02-15 08:13:11 -06:00
Brad Gonzales
936facbe86
Issue #1615 Updated group name in common_static edexProcessStats.xml. Added delta script to update aggregate table group names from pluginName to dataType.
...
Amend: Corrected comment in convertPluginNameToDataType.sh
Change-Id: I5e0084704cef599d368165058b8008bbb2bc8e18
Former-commit-id: 6a0e9c331b
[formerly 03dd42463e
] [formerly dfef89ee64
[formerly a2391d76c91d3d2b86b8e74eed1e0754091650a0]]
Former-commit-id: dfef89ee64
Former-commit-id: e495a5f663
2013-02-14 17:34:55 -06:00
Dustin Johnson
158ce1fe5b
Issue #1595 Fix expired subscription update retrieval time scheduling
...
Change-Id: I225bf887d03e43295f4b18eea677bb24c032b8a7
Former-commit-id: 54dd90afdd
[formerly 656601f272
] [formerly f6a286da2d
[formerly 26dd90355f6ce2ed5c409a142622cf220754c2ab]]
Former-commit-id: f6a286da2d
Former-commit-id: 776581bc55
2013-02-14 15:33:06 -06:00
Nate Jensen
b4aea0385c
Merge "Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT" into development
...
Former-commit-id: 5526ee7e8d
[formerly 1144f08e59
] [formerly a3e0bf09ab
[formerly a8fbe37f3f30721d7a14c653993758c1a9f2d2ad]]
Former-commit-id: a3e0bf09ab
Former-commit-id: 3f5b8b56ef
2013-02-14 15:05:14 -06:00
Dave Hladky
a17dee033a
Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
...
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950
Former-commit-id: 2655952304
[formerly 7b3a310f67
] [formerly 381aec5976
[formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00
Ben Steffensmeier
efaddb710c
Issue #1614 allow locationNames for grid data access
...
Change-Id: I5d88708909b8f76ebdf6fac64a330854781ffae2
Former-commit-id: ef7addb005
[formerly ab319bd3a8
] [formerly 9b4de367e3
[formerly 7fe101c9fdb9266cd7c16a6c0a7281b9f9836cc4]]
Former-commit-id: 9b4de367e3
Former-commit-id: 0995024482
2013-02-14 10:07:01 -06:00
Dustin Johnson
6f821ed8c9
Issue #1543 Serialize DODS response rather than plugin data objects directly
...
- Remove proxy classes for Spring transactions, use interfaces as Spring recommends.
Amend:
Peer review comments.
Set retrieval status to failed when payload is null.
Change-Id: I458b13856302c8faceeef985c1c41115644520b7
Former-commit-id: 25faaa2af0
[formerly dd8ca33fc4
] [formerly d143735ea8
[formerly 69f294183da4bbeb535b11c81550b1e9b4124ac6]]
Former-commit-id: d143735ea8
Former-commit-id: 9783dc4d9f
2013-02-14 09:49:22 -06:00
Richard Peter
ba2c69fb17
Merge "Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method." into development
...
Former-commit-id: edcf52d9c1
[formerly e92c1fe346
] [formerly 671f961a99
[formerly 6574bb0978629fd9fac45b2f7eee1dc7a42d5156]]
Former-commit-id: 671f961a99
Former-commit-id: 351d52b311
2013-02-13 10:24:50 -06:00
Richard Peter
0804763d1a
Merge "Issue #1526 refactor for clarity and to stream responses from pypies" into development
...
Former-commit-id: 7438d87e58
[formerly e611aab017
] [formerly dbcb8bd30e
[formerly a8d1d7259bf914fac127361bde67d6513f775e8f]]
Former-commit-id: dbcb8bd30e
Former-commit-id: 6ec1990bd9
2013-02-13 10:18:24 -06:00
Nate Jensen
54cea219cf
Issue #1526 refactor for clarity and to stream responses from pypies
...
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7
Former-commit-id: 56112143c3
[formerly 96232ab0ab
] [formerly 92076242fc
[formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]
Former-commit-id: 92076242fc
Former-commit-id: cbca34e709
2013-02-12 16:33:01 -06:00
Brad Gonzales
666c728476
Issue #1615 Changed ProcessEvent pluginName to dataType. Refactored GribDecoder decode method to a Processor exchange method.
...
Change-Id: Ib3eaf4c319d844c277dd7288d565bb9508fa46f8
Former-commit-id: 465764854a
[formerly 9917cb9f46
] [formerly 26f2374d54
[formerly 6eff40bb823594da5346022eeffc15910cdfb799]]
Former-commit-id: 26f2374d54
Former-commit-id: ec6bfc0d5e
2013-02-12 13:49:18 -06:00
Matt Nash
e97b31bb7e
Issue #1570 add ability for synchronous operations in PythonJobCoordinator
...
Change-Id: Ida7d53c8675dee57ef37e3544500b8306ecb54c4
Former-commit-id: 3b2fa3eafe
[formerly ba3a70d02c
] [formerly 85988ecfe6
[formerly f3f4604a64c797b998ffa7d4ccc574a0cc1dd633]]
Former-commit-id: 85988ecfe6
Former-commit-id: c0ce67463f
2013-02-12 13:39:44 -06:00
Nate Jensen
9fb05f0a96
Merge "Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused." into development
...
Former-commit-id: 2c516156f1
[formerly 207cca1edf
] [formerly 4452a5d62f
[formerly ec5a6b3d1ad551db73f3cd60eafe2b97267a6bdd]]
Former-commit-id: 4452a5d62f
Former-commit-id: 4e0e1fe65e
2013-02-12 12:15:37 -06:00
Matt Nash
39f3f70e1b
Issue #1446 return None in Python if data is not available. Users will need to handle None, but it seems like this is better rather than return them an empty array and risk them searching through the empty array for values that are not there and getting more confused.
...
Change-Id: I36d72ed9642752eb92ae0902892bd79810111c07
Former-commit-id: 2bed543d32
[formerly 1c504de33e
] [formerly da21cf82e9
[formerly 4b56329756881b3291ad2856a5c166cdfc635bf9]]
Former-commit-id: da21cf82e9
Former-commit-id: d39f0938e8
2013-02-12 12:02:48 -06:00
Dustin Johnson
4a10957512
Issue #1543 Clean up test files after changing to Spring transactions
...
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680
Former-commit-id: 651c6d55c1
[formerly 4bcd75c091
] [formerly 19fd95d2c8
[formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]]
Former-commit-id: 19fd95d2c8
Former-commit-id: b4367903b0
2013-02-12 11:59:45 -06:00
Dustin Johnson
e8f382e7c0
Merge "Issue #1554 fix XmlGenericMapAdapter to work with null maps." into development
...
Former-commit-id: ab7e404ffa
[formerly 9004e0f57c
] [formerly 5c1c1ec582
[formerly 2d2dd4cc62a45794a3a912eb75c9d2745815dc4e]]
Former-commit-id: 5c1c1ec582
Former-commit-id: 12b6ac3d56
2013-02-12 07:59:24 -06:00
Dustin Johnson
ecbd1896dc
Merge "Issue #1543 Add testing of current OpenDAP type retrievals. - Add test for current behavior of SBN-like retrievals. - Change session management to use a factory implementation. - Add service locator strategy to find jaxbables. - Tests cleanup. - Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality." into development
...
Former-commit-id: bc8fb2f4ea
[formerly 2457359c0f
] [formerly 6a4a11536e
[formerly 4d055580ddea29eb35983dbe4e9e01a611f23ba1]]
Former-commit-id: 6a4a11536e
Former-commit-id: da9072b0f1
2013-02-12 07:58:39 -06:00
Ron Anderson
1ec0410989
Merge "Issue #1554 initial implementation of GFE grid factory. Change-Id: Id2ae308c0c13822dd6e5dd0195f7920df82ff994" into development
...
Former-commit-id: dfe0723e65
[formerly 5bee722544
] [formerly 9713b42306
[formerly 7c4d695201e473de349f4f5a83a1a5283d6cb4f4]]
Former-commit-id: 9713b42306
Former-commit-id: 184cd6d508
2013-02-11 17:20:21 -06:00
Ron Anderson
c862db5513
Issue #1603 Fixed disappearing smartInit HDF5 files. Code cleanup and GFE performance logging.
...
Change-Id: I820a780dcbaa3e6ffefd56737bac7dbc13c2e485
Former-commit-id: 95d18f9283
[formerly 771296a845
] [formerly b6a9b42094
[formerly 39282e6528aeb01a40a01df477f4579afab79ca3]]
Former-commit-id: b6a9b42094
Former-commit-id: 12b0fbdab8
2013-02-11 17:16:48 -06:00
Ben Steffensmeier
ae0ac4e21c
Issue #1554 fix XmlGenericMapAdapter to work with null maps.
...
Former-commit-id: 4a7d94ecbd
[formerly 60c435861a
] [formerly 7220c4c6cc
[formerly 904e3387de59f534b6457c7a12e8f94d55974884]]
Former-commit-id: 7220c4c6cc
Former-commit-id: 21616e06ce
2013-02-11 16:08:58 -06:00