Bryan Kowal
|
ea86a8ba59
|
Issue #1293 - remove hdffileid and create delta script to update existing databases
- now in the 13.4.1 branch
Former-commit-id: 885dd56459 [formerly e92e2712da] [formerly 4cc9a742c8] [formerly c08190a586 [formerly 4cc9a742c8 [formerly f58fa2c5360cdbf38580bb675d2acdc8cb6b438e]]]
Former-commit-id: c08190a586
Former-commit-id: 0bd4d2c02ecc3f80e814b1c7593bcf9ddb429c21 [formerly 55f234c2d1]
Former-commit-id: eea02ee972
|
2013-04-08 14:04:05 -05:00 |
|
Dustin Johnson
|
73a8bb7a02
|
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: 3a6d9209df [formerly cef805e79a] [formerly 61346b1388] [formerly f3bdede2c8 [formerly 61346b1388 [formerly 5a8249a78daaeed19079e78f6c4f07b08e817ff0]]]
Former-commit-id: f3bdede2c8
Former-commit-id: da2f137f6b51f8ac36c0d76f597f0c82e1dfd829 [formerly 8c52cd190f]
Former-commit-id: 4b4eb8e406
|
2013-04-05 12:41:02 -05:00 |
|
Dustin Johnson
|
ba666a0216
|
Issue #1872 Fix compile errors
Change-Id: Ic70a61c30bbe8ff4768a8079beb5be5f9336876a
Former-commit-id: ff6f1dc67a [formerly ec85cdcf8c] [formerly 7cf482512d] [formerly 06e6d84273 [formerly 7cf482512d [formerly 2b84d1a58c99858784294bf32b293f8a54c38ecd]]]
Former-commit-id: 06e6d84273
Former-commit-id: 59856ee7614cee35d409908965a9a266ed5ee207 [formerly add67ae3dc]
Former-commit-id: 9531e50cac
|
2013-04-04 16:44:57 -05:00 |
|
Roger Ferrel
|
ef8461965e
|
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: 50ffd4082b [formerly 90dae591a6] [formerly 998714524d] [formerly b00d64ec0a [formerly 998714524d [formerly 882f96509c19f0621a4f6e6806e3177f6c566562]]]
Former-commit-id: b00d64ec0a
Former-commit-id: 3ba9851638529124c64d3eb3b31a74ca7dd0db71 [formerly 8c5f3fb8f7]
Former-commit-id: 5c4a938c72
|
2013-04-04 13:22:10 -05:00 |
|
Max Schenkelberg
|
c8e0d2ca98
|
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Conflicts:
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java
Former-commit-id: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]]
Former-commit-id: b042037a67
Former-commit-id: 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13]
Former-commit-id: fb1a6e203b
|
2013-04-04 13:21:35 -05:00 |
|
Mike Duff
|
54c3173f69
|
Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: b96f951732 [formerly 57146e3c95] [formerly 42fa10a859] [formerly 15c4f53172 [formerly 42fa10a859 [formerly 33f7392176acf8da158f309451557edd677c7805]]]
Former-commit-id: 15c4f53172
Former-commit-id: e9f2c7d68b92623b0e477d83de8068a69aeaec7f [formerly dd5dc7f0d2]
Former-commit-id: c2e22945f6
|
2013-04-04 13:20:28 -05:00 |
|
Roger Ferrel
|
3ba7a255df
|
Issue #1735 Performance improvments for LLWSData.
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f
Former-commit-id: 23d3ab925d [formerly f6ccec22b0] [formerly 0b224e9b84] [formerly 54daec6dc6 [formerly 0b224e9b84 [formerly 55230d49b580be00dcd092c80dca3ee7e37563c3]]]
Former-commit-id: 54daec6dc6
Former-commit-id: a2309ab886cfb5a81042406997df735ce9256a80 [formerly d49314c184]
Former-commit-id: 57bc235dbd
|
2013-04-04 13:11:59 -05:00 |
|
Dustin Johnson
|
94002b3be9
|
Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.ogc.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/DefaultLayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerCollector.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerHolder.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/LayerTransformer.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleDimension.java
edexOsgi/com.raytheon.uf.edex.ogc.common/src/com/raytheon/uf/edex/ogc/common/db/SimpleLayer.java
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/res/spring/grib-dpa-ingest.xml
edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/src/com/raytheon/uf/edex/plugin/grib/ogc/GribLayerCollector.java
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/build.properties
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/res/spring/obs-dpa-ingest.xml
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/MetarLayerCollector.java
edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/src/com/raytheon/uf/edex/plugin/obs/ogc/metar/feature/Metar.java
edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
edexOsgi/com.raytheon.uf.edex.wcs/src/com/raytheon/uf/edex/wcs/reg/DefaultWcsSource.java
edexOsgi/com.raytheon.uf.edex.wms/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/reg/DefaultWmsSource.java
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/styling/ColormapStyleProvider.java
edexOsgi/com.raytheon.uf.edex.wms/src/com/raytheon/uf/edex/wms/util/ColorMapUtility.java
Former-commit-id: af4da9286b [formerly dbeffa91fe] [formerly 375f0801a2] [formerly 3c41127c42 [formerly 375f0801a2 [formerly 0b38c35370237a6215bb2eba9347de9b9f0a7ea1]]]
Former-commit-id: 3c41127c42
Former-commit-id: 1aa6cc2e6bc2ae28b658d5879fe7eb65cc4a7b70 [formerly 0dc74710ce]
Former-commit-id: 9a4f4431de
|
2013-04-04 13:10:24 -05:00 |
|
Bryan Kowal
|
710c23bd4c
|
Issue #1805 - slightly modified viz feature build order
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569
Former-commit-id: 685123f51d [formerly 40dd190ecf] [formerly 40a4b38929] [formerly 8187df486a [formerly 40a4b38929 [formerly 7e6ffbe4447fcaf13cae49d16038d5edfa0cdfec]]]
Former-commit-id: 8187df486a
Former-commit-id: c293c242989b735cdbe96bb812cb793e886d8b66 [formerly 3c70c5be2b]
Former-commit-id: ee25f748c1
|
2013-04-04 13:02:49 -05:00 |
|
Greg Armendariz
|
f0957645ad
|
Merge "Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE" into development
Former-commit-id: 88a6a8abb3 [formerly 6e0ced27dc] [formerly d6d0e0131f] [formerly 71d400e09f [formerly d6d0e0131f [formerly fa1c24a0aa4004b9403e39ce94a99a88f423466e]]]
Former-commit-id: 71d400e09f
Former-commit-id: db325a9270fe94f678cb6b219d0d78c03ac26ba9 [formerly d463555ca3]
Former-commit-id: f452a4582a
|
2013-04-04 13:00:39 -05:00 |
|
Bryan Kowal
|
b4e684ad08
|
Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
Former-commit-id: c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly 64c54f2110 [formerly 3fac666de5 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]
Former-commit-id: 64c54f2110
Former-commit-id: 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa [formerly 49ee55327d]
Former-commit-id: 6a66158097
|
2013-04-04 12:48:59 -05:00 |
|
Steve Harris
|
bbfc0f76ef
|
Merge branch 'omaha_13.3.1' into development
Former-commit-id: 4dfea33cdd [formerly 9879b94de9] [formerly 8b607f8228] [formerly 5c9a6b83cc [formerly 8b607f8228 [formerly ef87d76141000e00dc04ab0cc4db4ad80006b636]]]
Former-commit-id: 5c9a6b83cc
Former-commit-id: 0738423fc8a58844573f709645061e99d15cff90 [formerly ed8c0487fe]
Former-commit-id: 0f53c46d7a
|
2013-04-04 11:58:50 -05:00 |
|
Bryan Kowal
|
64dbc18c8e
|
Issue #1859 - the Xss JVM parameter will now be included in the ini files for the 32-bit CAVE
Change-Id: I4d5a152dd44cd0a80405e04ce18d40e820bd06e6
Former-commit-id: a8fe170b53 [formerly c448651065] [formerly 03a2e82b77] [formerly 8d3c98eb5d [formerly 03a2e82b77 [formerly 54f97bfeaecf8fc99d8572a94977d863c547fe17]]]
Former-commit-id: 8d3c98eb5d
Former-commit-id: fab6d44468dbf0db3894a28e8b00ea49184bb43e [formerly 5816ddaf77]
Former-commit-id: 12e9b9d75b
|
2013-04-03 18:27:10 -05:00 |
|
Nate Jensen
|
91c6521d10
|
Merge "Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned. Change reviewer comments." into development
Former-commit-id: 59f084426c [formerly f43ac8bbc3] [formerly 196012618bd9ee95a1de54a228f9df4a97196cf6 [formerly 79a9d76915]] [formerly 73d86e8926 [formerly 79a9d76915 [formerly eaabe1a4935051d003ed302de193cfb183118845]]]
Former-commit-id: 73d86e8926
Former-commit-id: 641d60c190b7ce188d34ee3d8a2f74fb6d1a5e54 [formerly c87d157cbd]
Former-commit-id: e74f83d83a
|
2013-04-03 17:28:49 -05:00 |
|
Steve Harris
|
b2de6fd4c1
|
Merge branch 'master_13.3.1' (13.3.1-18) into omaha_13.3.1
Former-commit-id: 77c0dd0b55 [formerly 2bc12f7a23] [formerly 0f000f4485] [formerly 327d05f3b5 [formerly 0f000f4485 [formerly 131cf22b16b3109fdc13a8346524fc8d2e230b7f]]]
Former-commit-id: 327d05f3b5
Former-commit-id: 17693382994fce6acddb70eda705f85cda502c1d [formerly c7b9690456]
Former-commit-id: 0342b648b6
|
2013-04-03 15:52:19 -05:00 |
|
Ron Anderson
|
0acc778948
|
Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1
Former-commit-id: 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]
Former-commit-id: c82968c1e6
Former-commit-id: d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d]
Former-commit-id: a633b96fdf
|
2013-04-03 15:25:52 -05:00 |
|
Steve Harris
|
a196ebc11b
|
13.3.1-18 baseline
Former-commit-id: e621424fcb [formerly f3e79bcc9d] [formerly a2b098d86d] [formerly ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]]
Former-commit-id: ce6a06a7e3
Former-commit-id: 6155a83f5aa46637b96708a2e4492a382c4e5e79 [formerly bf6c3b6762]
Former-commit-id: 0edd049e3b
|
2013-04-03 14:58:29 -05:00 |
|
Nate Jensen
|
62eb52e295
|
Issue #1855 fix python threading in GFE procedures and smart tools
Change-Id: I6420338991c1961ce63ff944b516925f83a12994
Former-commit-id: 52e83d902b [formerly 5c830c3c9c] [formerly e3462292ab] [formerly fe24e34163 [formerly e3462292ab [formerly c4549e0279a3026adc2f7b40bb272fc4f59acf59]]]
Former-commit-id: fe24e34163
Former-commit-id: 27fc586eb36f76446b7be74d68ec2819f9554038 [formerly e18e798a94]
Former-commit-id: 1c6643e7de
|
2013-04-03 14:33:24 -05:00 |
|
Lee Venable
|
49fc55ce03
|
Merge "Issue #1858 Handled creating a follow up when initial was created before 0z but issued after." into omaha_13.3.1
Former-commit-id: bd785bf5a4 [formerly c8549e67d6] [formerly 3c5ad3f05ae8b9a69baf559e5cc805bf532d11ce [formerly 40b8ecf27d]] [formerly ff910d99fc [formerly 40b8ecf27d [formerly ad96c48345c8b6f89ea337bd663cb7585981e941]]]
Former-commit-id: ff910d99fc
Former-commit-id: dc127c10f9c848a58411f7df06f86982131e3a2d [formerly 36a15b3be1]
Former-commit-id: 3d129d4526
|
2013-04-03 14:14:41 -05:00 |
|
Nate Jensen
|
0a783718a9
|
Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1
Former-commit-id: 3334d9b065 [formerly a109ec4601] [formerly dbbad421db] [formerly 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]]
Former-commit-id: 1bc148b468
Former-commit-id: 61a33575090f1b95703ee5ebf2af09b0f2f1fa1c [formerly ec8cdfd8f0]
Former-commit-id: 2d4dc636ce
|
2013-04-03 14:13:14 -05:00 |
|
Nate Jensen
|
10b70e4222
|
Issue #1562 max's fix for topo with custom colormaps
Change-Id: I7ede37a61d39cdc091c95a7d888af9347ca7621e
Former-commit-id: 869f5498f6 [formerly d64e0a2a39] [formerly 057a929903] [formerly 6c711f037c [formerly 057a929903 [formerly 88e676506f6dec74514c25260edcc44d9e0564d5]]]
Former-commit-id: 6c711f037c
Former-commit-id: a8d505a73fefb71d965eb0d0a4c7619632647528 [formerly 616612e550]
Former-commit-id: 6ca17c5a2a
|
2013-04-03 14:10:53 -05:00 |
|
Ron Anderson
|
a0c34f1750
|
Issue #1774 Moved wind component checking to GfeIngestNotificaionFilter
Change-Id: Ia34d564e6cfc8aaee4d254fbeca6f8e939acdc59
Former-commit-id: 3e61a80508 [formerly 34c8aad559] [formerly 3a3cdcbf46] [formerly b703b4779e [formerly 3a3cdcbf46 [formerly d8b7834dbdbe6479745cf9a56ff36283c21d3bd0]]]
Former-commit-id: b703b4779e
Former-commit-id: 2ed70c94d4f1788d709469642bb3b7a34fdeef14 [formerly 065ba61389]
Former-commit-id: 0d57a752dc
|
2013-04-03 14:01:18 -05:00 |
|
Roger Ferrel
|
3248f4bcf2
|
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: e87e4c869d [formerly f8d1a13c38] [formerly 54cbf656e9] [formerly d2aae617b2 [formerly 54cbf656e9 [formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]]
Former-commit-id: d2aae617b2
Former-commit-id: 116b58dfaee7c620e2aea5a1b9ca83d6a22be2db [formerly 7b829a2fec]
Former-commit-id: 2b4b10d643
|
2013-04-03 12:48:18 -05:00 |
|
Jonathan Sanchez
|
689334d2e1
|
Issue #1858 Handled creating a follow up when initial was created before
0z but issued after.
Former-commit-id: 262f280821 [formerly 9b547cab98] [formerly 9c322bf4b7] [formerly 799b8c57ef [formerly 9c322bf4b7 [formerly b123df8e9dea005c35865f4a71ef28b1d9c8cba8]]]
Former-commit-id: 799b8c57ef
Former-commit-id: a8114ff352a146cacee317eae56977b042f8cda5 [formerly bd25782b7a]
Former-commit-id: 7ca110890a
|
2013-04-03 11:43:59 -05:00 |
|
Ben Steffensmeier
|
f2915807a0
|
Issue #1824 Fix Tile Geometry creation.
Former-commit-id: f8db56c0af [formerly fe561d7af0] [formerly fedbc28588] [formerly cfcc33cd7b [formerly fedbc28588 [formerly 9c77d1a4d12dd8fd0c684bd48a7fc1a02a34dbac]]]
Former-commit-id: cfcc33cd7b
Former-commit-id: a47a6ce1413348a47ef24247df2a0ba67f2fd485 [formerly 58d81f6556]
Former-commit-id: e0bbe368be
|
2013-04-03 10:59:11 -05:00 |
|
Mike Duff
|
a932186e2f
|
Issue #1731 - fix problem with dmd updating.
Change-Id: I1f3eb576cf26a42195ca9c4cadfbeaeb77394af6
Former-commit-id: 335b85ea48 [formerly c3ab8259d5] [formerly 64cdb3c7fd] [formerly 23c8085402 [formerly 64cdb3c7fd [formerly a8c25cfced44c7e3edfd1b37af73b2af8753212b]]]
Former-commit-id: 23c8085402
Former-commit-id: ca721abdd76f0ab8bfb9d6237b043b5674132b84 [formerly 3f2f0937ce]
Former-commit-id: bb14757eed
|
2013-04-02 16:22:23 -05:00 |
|
Nate Jensen
|
c82a67f378
|
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
Former-commit-id: cb6cd91f06 [formerly ab28523a09] [formerly e8b5b33c4c8ab18f2df27e54bff8de6a2458c098 [formerly f57358cff8]] [formerly 8f9ec8dd2c [formerly f57358cff8 [formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 98771bb0bfd73fcc71ef677f5788874166df11aa [formerly 374eed35b3]
Former-commit-id: 1ad5bb1a52
|
2013-04-02 14:29:15 -05:00 |
|
Dustin Johnson
|
c42ca22867
|
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: 5b7fcb1ce2 [formerly 48a2002e68] [formerly c981b7250f] [formerly 6129d86be4 [formerly c981b7250f [formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]]
Former-commit-id: 6129d86be4
Former-commit-id: e2262bcbcadbf80beb178caf980ef3cfba79d608 [formerly dd8f4d8454]
Former-commit-id: 644ed2396d
|
2013-04-01 15:35:51 -05:00 |
|
Max Schenkelberg
|
984e67acda
|
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: a59484e232 [formerly 9d032f3e84] [formerly b32fbad9c8] [formerly 547190329b [formerly b32fbad9c8 [formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]]
Former-commit-id: 547190329b
Former-commit-id: a0a981e01aeb782ac1535e091405ef4a6146176b [formerly 635388a7ad]
Former-commit-id: ba262e2bc5
|
2013-04-01 12:41:50 -05:00 |
|
Lee Venable
|
7e4696f582
|
Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: 6109daf744 [formerly e994040887] [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 4a8c4b64df [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 80217d8bb653fed512ec88e601b9cf14286e1708 [formerly 35d27f89f1]
Former-commit-id: 58c83b9662
|
2013-04-01 12:26:23 -05:00 |
|
Steve Harris
|
47c7f66f2b
|
Merge branch 'omaha_13.3.1' into development
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]
Former-commit-id: 437a04011a
Former-commit-id: 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]
Former-commit-id: 7b27767d7e
|
2013-04-01 12:19:04 -05:00 |
|
Steve Harris
|
12055591ea
|
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: d2d9195925 [formerly 3b722f1076] [formerly 74a47b9bd9] [formerly 14c9de2259 [formerly 74a47b9bd9 [formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]]
Former-commit-id: 14c9de2259
Former-commit-id: a4cc33aa9085686f63b90ec8d97f993debdfb35b [formerly a6dd28cc82]
Former-commit-id: f85a1ab9ab
|
2013-04-01 12:15:04 -05:00 |
|
Lee Venable
|
1c1b083dbf
|
Merge "Issue #1790 Changes for non-blocking StationProfileDlg." into development
Former-commit-id: 35413b2833 [formerly 7d73b8dacf] [formerly fe89cb7fe4] [formerly d3390596f4 [formerly fe89cb7fe4 [formerly fe244abd3f625d7334284d4657bd8f35737e86a5]]]
Former-commit-id: d3390596f4
Former-commit-id: 68ab799532cdacaca9c02a6f89555b70848b70ca [formerly 89da26a266]
Former-commit-id: 4e95ffe2ae
|
2013-04-01 12:06:16 -05:00 |
|
Steve Harris
|
a6ff543f88
|
13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]
Former-commit-id: ef413da5f7
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
994aab5c6a
|
13.3.1-16 baseline
Former-commit-id: 712c13a655 [formerly a262f22cee] [formerly 51380726d4] [formerly 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]]
Former-commit-id: 3066dd33e5
Former-commit-id: 4ee75d69123e11d9ab2091fbd33d33a09b414210 [formerly 36a4b3eb51]
Former-commit-id: 6b75202d07
|
2013-04-01 11:39:08 -05:00 |
|
Mike Duff
|
0f3223b8b9
|
Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77
Former-commit-id: eb0a77c8ac [formerly fa8ca827d1] [formerly 261a39122d] [formerly 9c2ac87482 [formerly 261a39122d [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: 40f4ad0f38b194a5fd5090487f0a7c14332e060c [formerly 11ca7c2c20]
Former-commit-id: e627279d7c
|
2013-04-01 11:36:53 -05:00 |
|
Richard Peter
|
fcbac13167
|
Merge "Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile" into development
Former-commit-id: b921a25faf [formerly 2fa88522ff] [formerly e221223f8a] [formerly 255617199c [formerly e221223f8a [formerly 6b3523df82d62d75db483baad329cc6d9a2ade13]]]
Former-commit-id: 255617199c
Former-commit-id: 278bd2cb7526a3ad41f96620998122ab2e04cbef [formerly ea4a599a5a]
Former-commit-id: 65f317e56b
|
2013-04-01 11:33:59 -05:00 |
|
Steve Harris
|
4df1b4aeae
|
13.3.1-15 baseline
Former-commit-id: 70fece2da1 [formerly 4cf3ad6abb] [formerly eb1dab3864] [formerly 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]]
Former-commit-id: 3d8ed484be
Former-commit-id: 2a3aaa1bdc7787d9eb37d0e30bdab63d5e6f4495 [formerly d3cec5d3cb]
Former-commit-id: 2bf790aae3
|
2013-04-01 11:33:20 -05:00 |
|
Max Schenkelberg
|
af56d47973
|
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: 6c1c9f25d5 [formerly a508e9c8cb] [formerly 321a29ffa4] [formerly 51d976e5e2 [formerly 321a29ffa4 [formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]]
Former-commit-id: 51d976e5e2
Former-commit-id: e3dd868a83e249e4b426fe0bcf89cd02cc3f3360 [formerly 1c35a54a9f]
Former-commit-id: 8de3a70962
|
2013-04-01 10:19:36 -05:00 |
|
Lee Venable
|
ec82403afa
|
Merge "Issue #1790 Changes for non-blocking StationListDlg." into development
Former-commit-id: b100693786 [formerly 7389bf5b29] [formerly 2875600910] [formerly 0bfc05ce61 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]]
Former-commit-id: 0bfc05ce61
Former-commit-id: 4e6a76ba3f476fd4e5523e043921ad6ad3166ef7 [formerly 3d683e98a9]
Former-commit-id: ebfa8ea79c
|
2013-04-01 09:40:59 -05:00 |
|
Roger Ferrel
|
b78126a764
|
Issue #1790 Changes for non-blocking StationProfileDlg.
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef
Former-commit-id: 7551b03bfe [formerly e1b40f9f2f] [formerly 0d269691e2] [formerly d21cb5e2e8 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 9aeb83700b132f9f7b7a467ee07c274704d24266 [formerly 944d03615e]
Former-commit-id: 86e21acae2
|
2013-03-29 17:11:02 -05:00 |
|
Ben Steffensmeier
|
d2fa8b7c0c
|
Issue #1799 fix modal tools again.
Former-commit-id: 0802c4cd3d [formerly cffac354e8] [formerly eeeede7288] [formerly 66af8daa11 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]]
Former-commit-id: 66af8daa11
Former-commit-id: 788f9b6d4dfdc20ad93f496e50d5d0160cd0daa5 [formerly 7082466303]
Former-commit-id: 11e6afa5fa
|
2013-03-29 14:30:54 -05:00 |
|
Roger Ferrel
|
e536a10191
|
Issue #1790 Changes for non-blocking StationListDlg.
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be
Former-commit-id: 6d83f23cc2 [formerly 281e7f53cb] [formerly c5a95dcb44] [formerly 6ad80607bc [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]]
Former-commit-id: 6ad80607bc
Former-commit-id: b9523cc26b55358eb9448f57d15ea5437f8eccc1 [formerly de02460b11]
Former-commit-id: ba0060522f
|
2013-03-29 13:46:51 -05:00 |
|
Roger Ferrel
|
ecdb29cc1d
|
Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 9c498726af [formerly 20f6baba0e] [formerly 8f4492c63c] [formerly 463407a40e [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: b5cf324e1831cdc6b8016baf3b449a6934efcbe0 [formerly ec5f32aec6]
Former-commit-id: 8c1116eaae
|
2013-03-29 11:35:08 -05:00 |
|
Ron Anderson
|
ba064a146a
|
Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled.
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089
Former-commit-id: d7f0cfe92d [formerly 4ac9a4d9a8] [formerly 0f4fb125b0] [formerly c7cfcf0250 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]]
Former-commit-id: c7cfcf0250
Former-commit-id: b7666888685e677f58fc852f5e79b4f07dcfe700 [formerly 9cfa87f7e5]
Former-commit-id: cd0f319ec5
|
2013-03-29 10:48:26 -05:00 |
|
Nate Jensen
|
8092e699e6
|
Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1
Former-commit-id: 9d74722ce0 [formerly 3ad797690b] [formerly 214b2ed4ba] [formerly 1bf37125c4 [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]]
Former-commit-id: 1bf37125c4
Former-commit-id: 30f54582860a05d8d3bdb9a1608610e277dc1958 [formerly 711fbe98d2]
Former-commit-id: 946323416c
|
2013-03-28 17:02:14 -05:00 |
|
Ben Steffensmeier
|
d7d0ea7264
|
Issue #1799 fix activation of tools for new perspectives.
Former-commit-id: 6bf1ec8543 [formerly dcbed65681] [formerly 50a276a7e2] [formerly 4efa92ff49 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]]
Former-commit-id: 4efa92ff49
Former-commit-id: 2aaf804695afe25cc1d0feb84ab77be8addda34b [formerly a415fb17ae]
Former-commit-id: 33de9bfc87
|
2013-03-28 15:47:36 -05:00 |
|
Ron Anderson
|
65dd075089
|
Issue #1774 Fix D2D accumulative parameter time ranges
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 80bd994f20 [formerly 27e07ce4a9] [formerly 5bb47b7931] [formerly b65ecfc151 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]]
Former-commit-id: b65ecfc151
Former-commit-id: 8becee59e148ef01f28560b8511322fa50267284 [formerly 3f2fa771d9]
Former-commit-id: 33bcf5fee8
|
2013-03-28 13:37:29 -05:00 |
|
Max Schenkelberg
|
0bd1554e20
|
Issue #1638 Fix merge error
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712
Former-commit-id: 33352d0e53 [formerly 25202d8534] [formerly 573b441662] [formerly 2b58e3ce3f [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: 6e4fa7c7c493c3578c067bb8eeff65574ac1665b [formerly c9301b75ea]
Former-commit-id: abcf4bf569
|
2013-03-28 10:20:54 -05:00 |
|
Lee Venable
|
9b754cf557
|
Merge "Issue #1790 Bug fixes for SCAN." into development
Former-commit-id: 87e166d88d [formerly a891171c43] [formerly e7805ded92] [formerly 167fa6eadf [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]]
Former-commit-id: 167fa6eadf
Former-commit-id: bafa15f4cfb79c82ba6e59d41e92b5a7d5efc1f8 [formerly 772bbe23a7]
Former-commit-id: 655f06cb65
|
2013-03-28 10:04:34 -05:00 |
|