Richard Peter
|
947e806283
|
Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29
Former-commit-id: c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly c4b6c6cc6e [formerly 63114b4f82] [formerly 86aea04167] [formerly 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]]
Former-commit-id: 0430619d7b
Former-commit-id: c7ed1a1a93 [formerly 328a48a33d] [formerly 1d72a41cca6b73062aea9ce9df36d0a583f99940 [formerly 02c77af062]]
Former-commit-id: e6a8171a0a16b8b60e17b8f3deef62cac56bd1ec [formerly 400aa47f46]
Former-commit-id: a74bd68f72
|
2014-05-08 12:58:49 -05:00 |
|
Steve Harris
|
a7c453801c
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly 9b4b0d5c01 [formerly a804a071c0] [formerly ce2b030743] [formerly ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]]
Former-commit-id: ff4a6b8122
Former-commit-id: bfd8f9b971 [formerly 532b861bce] [formerly 12b7c2d1dfdafd204880707993afeebf47eefe41 [formerly 988ad59a0d]]
Former-commit-id: 14bc990e4d26f4fcba9b4f047441d279289dbc89 [formerly 47991060bb]
Former-commit-id: 77030c2fc3
|
2014-05-08 09:50:34 -05:00 |
|
Richard Peter
|
f616052d9a
|
Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528
Former-commit-id: ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly ab64a3e814 [formerly ad3f6c4af3] [formerly 6469ae94ed] [formerly 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]]
Former-commit-id: 348bc25760
Former-commit-id: 899b8ce879 [formerly c9d8bfdd06] [formerly a327ca6aece2679db79622f22c10369b6cebc586 [formerly 95488f49b1]]
Former-commit-id: 42e521199bcad7a7bb553d4e0ab315e50be9c393 [formerly 284e1b762d]
Former-commit-id: 8c41358d2c
|
2014-05-08 09:18:49 -05:00 |
|
Richard Peter
|
0f0eb6d584
|
Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly 731f55d574 [formerly 242716fb0f] [formerly d5ec01f7c0] [formerly adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]]
Former-commit-id: adff7b5684
Former-commit-id: e3e1298591 [formerly 741710881f] [formerly a8128262c0240c076be7f2d7613f15608d925c72 [formerly 7a7b65860b]]
Former-commit-id: 065948ec980c395d5dc6d7a3764fa1461ccb4d8e [formerly 401a880686]
Former-commit-id: 28d5614351
|
2014-05-08 09:06:31 -05:00 |
|
Steve Harris
|
36a5745de6
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
Former-commit-id: 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly 03908ba8ae [formerly ddd6e35478] [formerly e37e40ed19] [formerly b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]]
Former-commit-id: b7a1bda98c
Former-commit-id: f1032ccc05 [formerly 7a7c1167c2] [formerly d3c134610c7a2e642c723287f1d8135b292eb22c [formerly 9591532ffd]]
Former-commit-id: fab7d30fa99a5cbb15284899c9cda059f1e07992 [formerly 049716e54d]
Former-commit-id: 2b29fec8d6
|
2014-05-07 16:01:53 -05:00 |
|
Everett Kladstrup
|
cc773e68b3
|
Omaha #3133 Remove some unecessary dependencies
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest
Former-commit-id: 4ea3156453 [formerly 516a50a6a1] [formerly 3a00185e3c] [formerly 4ea3156453 [formerly 516a50a6a1] [formerly 3a00185e3c] [formerly b4a76a575a [formerly 3a00185e3c [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]]
Former-commit-id: b4a76a575a
Former-commit-id: a472cd5363 [formerly a1070cc1ac] [formerly 0b36cc357c9ac92e1860eb4bdfa5b01916468b94 [formerly ce743b3c43]]
Former-commit-id: 0e2083fe7450a35200ddd48f67051f8764b4cc01 [formerly 279be89f4b]
Former-commit-id: dffec9a07f
|
2014-05-07 12:54:37 -05:00 |
|
Nate Jensen
|
9831077b42
|
Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly 3aa9bfdca1 [formerly 49d34cc4e4] [formerly 5191b61b30] [formerly aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]]
Former-commit-id: aa7c1fac90
Former-commit-id: c333277d30 [formerly 815aa21d8e] [formerly e218d9c6b2e2544a412d7bf24b528ba73c8cd8fc [formerly 8c1748d370]]
Former-commit-id: a4bf8704f87869be96548083ce3e4e75a769e292 [formerly b708774e64]
Former-commit-id: cf09a6729c
|
2014-05-06 17:08:04 -05:00 |
|
Everett Kladstrup
|
88ea345459
|
Omaha #3112 Fix adding classes to WFS jaxb
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest
Former-commit-id: 129f3017bb [formerly 2ee2db6f38] [formerly 1184e77f1a] [formerly 129f3017bb [formerly 2ee2db6f38] [formerly 1184e77f1a] [formerly aedb166b4d [formerly 1184e77f1a [formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]]
Former-commit-id: aedb166b4d
Former-commit-id: de20eacce2 [formerly 5f378b30f0] [formerly 2e1fc87ea552bfc388ab6869d1d09dea57299cff [formerly 08e8a4a60a]]
Former-commit-id: 9120483421ae11f403d09788c224edb0bce9fd34 [formerly 8a4e0f8d71]
Former-commit-id: 99fd65216e
|
2014-05-06 17:07:23 -05:00 |
|
Richard Peter
|
c85f22eb55
|
Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 2044b64206 [formerly 884562700a] [formerly 03ab7599de] [formerly 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]]
Former-commit-id: 611c010968
Former-commit-id: 8e8e1c45ed [formerly be288505e0] [formerly f30788353ad2101cd2e64a4eed43d47dc68ddbb5 [formerly 4f2d470801]]
Former-commit-id: 91832432fed4e1ab82df2940b746247f362e5e2d [formerly a03997122b]
Former-commit-id: fc1f958e5b
|
2014-05-06 15:54:23 -05:00 |
|
Nate Jensen
|
12e89bf78d
|
Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 37b72c933b [formerly 7701820902] [formerly ff6c77420c] [formerly 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]]
Former-commit-id: 87b6df4840
Former-commit-id: b16bfd2b38 [formerly d1a040b9c2] [formerly 620466e14629a8e102bf9c9fd5dc3bbc2e70ff37 [formerly a6363fc3d4]]
Former-commit-id: 176e5be59eab5566cf29af7c6865a3042d0ab473 [formerly 5f08921768]
Former-commit-id: 17ddc5d8e5
|
2014-05-06 13:10:48 -05:00 |
|
Nate Jensen
|
77045e05ce
|
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 8b2c2d4be5 [formerly d83fad0054] [formerly 0e3876de34] [formerly 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: de7bade647 [formerly 732aaa6001] [formerly ad966bafd4b27ea29634f0d48df0a0cd01558773 [formerly 044d086fc1]]
Former-commit-id: 6911bb772bb5191fbb00c039757c3640c87a1879 [formerly 4db3b99181]
Former-commit-id: c8cc3b1b8e
|
2014-05-06 13:09:12 -05:00 |
|
Nate Jensen
|
8a31b5edf5
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 1d38804eb2 [formerly 3719c41d2b] [formerly 71b4227061] [formerly 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]]
Former-commit-id: 7cea97ab15
Former-commit-id: e8ca9729eb [formerly 5bf1554597] [formerly 4cf3887df369f38b75f0a2c9f9f7949057e50e42 [formerly 6bdbfb7e1a]]
Former-commit-id: 0fc7bbac68e600996cc014bbf843e66d5484e6e9 [formerly 66cd43313a]
Former-commit-id: ad7a69f2e3
|
2014-05-06 12:26:21 -05:00 |
|
Brian Clements
|
056a6bd882
|
Omaha #3116 changed log formatter class to match camel 2.12.3
Former-commit-id: 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 73b643e157 [formerly 170ce2c157] [formerly c77ba25dc8] [formerly 51eb6c9f06 [formerly c77ba25dc8 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: 474068d56a [formerly 5b26766041] [formerly a092d2d161356b1089eedda592170e6720447ad2 [formerly b8a648f543]]
Former-commit-id: af82e9e17e53e02626347f7e4818c1149ca3ffd9 [formerly ffc02d68d6]
Former-commit-id: 3c9f5ff37b
|
2014-05-06 11:38:38 -05:00 |
|
Richard Peter
|
a21d7ff038
|
Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly f76ed476c8 [formerly 8ae9cfba55] [formerly b148d11ec9] [formerly 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 9846fbd82c [formerly 7fe7b43ee2] [formerly c051c2b6a07908c54dd3268091a67a3084664d5b [formerly c6719da76b]]
Former-commit-id: 87bf6e58065855e010b5eeaf478f1099b3c04845 [formerly 4a140afac6]
Former-commit-id: 4f6a9a0562
|
2014-05-06 09:46:41 -05:00 |
|
Steve Harris
|
3eb4392746
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (updated in ufcore):
cave/com.raytheon.uf.viz.application.feature/feature.xml
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly dd01a4282b [formerly a8d3f4d885] [formerly 73ed3251bd] [formerly 83368e4b4e [formerly 73ed3251bd [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]]
Former-commit-id: 83368e4b4e
Former-commit-id: 7245029570 [formerly ea24d1dadc] [formerly 2b3b76c82538d382ce6a14c9e014860eb6ff65e2 [formerly caadbd3dd9]]
Former-commit-id: df9b11e0eb39b9514f40f87773a3af9916ea3bf3 [formerly 8cd5ed7a8e]
Former-commit-id: b8b5300a9b
|
2014-05-05 16:04:09 -05:00 |
|
Nate Jensen
|
0fc04a8c55
|
Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly f76ace3c9b [formerly 2b6c30e67d] [formerly 0cf0f724f4] [formerly d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 3853ef16bb [formerly 09091ccf25] [formerly 7beb650628fb602c30c71cbf5eab29724e2cc3f8 [formerly 97597c3ab1]]
Former-commit-id: 34e886c76b22b953edb7a826d23a880a02b62b77 [formerly 0840a62eb8]
Former-commit-id: d50f19d715
|
2014-05-05 13:06:08 -05:00 |
|
Dave Hladky
|
766d9f09a7
|
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly 7d244313a5 [formerly 0ac4de6ad0] [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: d9243205e4 [formerly 93ca9cfe6a] [formerly 407941b24c780437890a6937639d0d55a05f02fd [formerly 7611339cd8]]
Former-commit-id: 1470be2678cc30858e885d64731cb2816e28e3ab [formerly cb94f9fc97]
Former-commit-id: 7e763a5a22
|
2014-05-05 12:15:14 -05:00 |
|
Brad Gonzales
|
efd2324660
|
Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115
Former-commit-id: 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 0470903200 [formerly cbcd7dcc3e] [formerly df353f06f5] [formerly 39a2ec8f46 [formerly df353f06f5 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: 58fda9c22a [formerly b33bd153f4] [formerly 702f18abf50a79b37863af04c5f8463202ed6024 [formerly 78714c6ff7]]
Former-commit-id: ca2a543bc5fbdcba51437125a0e66e29af1de373 [formerly 91caaba15c]
Former-commit-id: 8aca12b211
|
2014-05-02 13:09:57 -05:00 |
|
Richard Peter
|
ce48a0230e
|
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 98fa705dd0 [formerly f38816d168] [formerly dc0b598fd4] [formerly 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]]]
Former-commit-id: 132d63ac44
Former-commit-id: 2507aaf753 [formerly 8e141a137a] [formerly c5d890d7b24b88a20dc8c01d92647c6864edfb22 [formerly 5314b412b4]]
Former-commit-id: ad8d5ade754f2f63500d72978fe455c4ad54fb06 [formerly b9351199b8]
Former-commit-id: 9326b9d125
|
2014-05-02 10:05:59 -05:00 |
|
Ben Steffensmeier
|
c2e3e72d01
|
Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 80104eaf42 [formerly 956f62a6ec] [formerly 6bdaba048c] [formerly 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]]
Former-commit-id: 23d6da4a18
Former-commit-id: ae0185a740 [formerly d2c0499f2c] [formerly e59b9a37c055ead6793b199f1f61c40b65e25ce2 [formerly 3300d8c75c]]
Former-commit-id: b8a7373be1db5d578132241657b4da4ea3baedd5 [formerly c2a3dbe9af]
Former-commit-id: dd315aa9b8
|
2014-05-01 18:02:08 -05:00 |
|
Steve Harris
|
059faff023
|
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly d2905e51d4 [formerly 9ecd871825] [formerly c8ba70a146] [formerly 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a268173ac [formerly 9a6ab8c52f] [formerly bf130d4e15490de77c6bbdbae09ac7d93618c08a [formerly bdf6d0b6be]]
Former-commit-id: 787bb8f6beeae504adb25f278d73dbfbb74159fb [formerly d7c31fe4a9]
Former-commit-id: 523cf536e2
|
2014-05-01 13:25:15 -05:00 |
|
Steve Harris
|
9e1da44e3b
|
Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
Change-Id: Id13953881429545bccb590a550c23a73f77d585e
Former-commit-id: 05d6049e35 [formerly 11ca44c583] [formerly 70ee74a311] [formerly 05d6049e35 [formerly 11ca44c583] [formerly 70ee74a311] [formerly ab0b1ec047 [formerly 70ee74a311 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]]
Former-commit-id: ab0b1ec047
Former-commit-id: e72b097763 [formerly beba75f87c] [formerly c4fa57c01ab1fe1ea3b7f0c5c4f08b8a4e6ba322 [formerly 579eb6e47a]]
Former-commit-id: f0b40a94c6bd9da6fed694725a0b76873bd047a5 [formerly 64849d50ec]
Former-commit-id: 56bf68d145
|
2014-05-01 12:53:06 -05:00 |
|
Nate Jensen
|
b2b5727db3
|
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly dba33e281e [formerly ba9ed2aba3] [formerly b7536a398b] [formerly 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]]
Former-commit-id: 96071c250d
Former-commit-id: c617423fd7 [formerly dbca36c2bc] [formerly 88095fd377297b348e1d0c64c9215b50da8eef27 [formerly 4c2923246a]]
Former-commit-id: f4c5590d3e741902d497b7b5cb7b21c8ccf1049b [formerly 704eff96aa]
Former-commit-id: 7c748842f0
|
2014-05-01 12:40:41 -05:00 |
|
Brian Clements
|
de694643a9
|
Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly eae19ec5ca [formerly 93912625ea] [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]]
Former-commit-id: dd5412e119
Former-commit-id: 8fc0feed89 [formerly 3fd504f1de] [formerly f6d182158a5782516e8b761f409c187bb4622b1d [formerly 2337d5ef56]]
Former-commit-id: e46f09623a9e504ef25b49b889bf64a2c46ca4bb [formerly c7cea4b5f7]
Former-commit-id: 36b2419ff1
|
2014-05-01 12:34:09 -05:00 |
|
Bryan Kowal
|
3ec47319cc
|
Issue #3099 - handle empty location name lists in the data request
Former-commit-id: dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly dfd5e3dbad [formerly ff21ef813c] [formerly 5eac78f0e0] [formerly a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 5267bae3dd [formerly 4775dc1f40] [formerly 766f5d140cfb513aced9899ffa7b673d5595123d [formerly 2079aec2bb]]
Former-commit-id: e262c8f5f445fb2cdc7edc1447e80f9bd8e97f6e [formerly bf24af6980]
Former-commit-id: 10a57d5299
|
2014-05-01 12:12:42 -05:00 |
|
Nate Jensen
|
7f6e325724
|
Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly fc261ab303 [formerly 7b2ed421f0] [formerly 2a0775e748] [formerly 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]]
Former-commit-id: 76ad31501b
Former-commit-id: 3634889dab [formerly ffb294cab4] [formerly cf11210c48f3e873f15155bc8644fb9af1296446 [formerly 191f6c3385]]
Former-commit-id: a264003449737f399c4846d23735afced10fd273 [formerly ee285cfc57]
Former-commit-id: 4669a93a96
|
2014-05-01 11:01:37 -05:00 |
|
Brian Clements
|
542b75e5be
|
Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly fe53a23d2c [formerly fee0a858cb] [formerly 873efa1c64] [formerly f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]]
Former-commit-id: f45e435f2c
Former-commit-id: 00e7061f42 [formerly 20830253ba] [formerly f9367f0487bc002acf5cc3b4733af6b6d9b49a24 [formerly c187523782]]
Former-commit-id: 1a699056f312f4be2eb1ef65d741ba8d01a416f7 [formerly c3d2b4be86]
Former-commit-id: 4c1a6b44c8
|
2014-04-30 17:52:43 -05:00 |
|
Richard Peter
|
68474fb70c
|
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
Former-commit-id: 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 83658fcbb5 [formerly d28c4fdbae] [formerly de9eb60629] [formerly 86ddd480c1 [formerly de9eb60629 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]]
Former-commit-id: 86ddd480c1
Former-commit-id: 9ee5b7c648 [formerly d961ff6edc] [formerly 75220412d93558970dc725fce5312cce7866166d [formerly 6ecb5018b6]]
Former-commit-id: f6db2a6fbbc579ddd2e876bdea84339cafc85568 [formerly dd54408a10]
Former-commit-id: cfb980db11
|
2014-04-30 17:43:50 -05:00 |
|
Dave Hladky
|
5fa53b22dc
|
Issue #2992 Updated DD list of active registries
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly a14cb8c45f [formerly e2a4bb6755] [formerly c352643c79] [formerly 3b00ae03cc [formerly c352643c79 [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: 5fc17cf3b8 [formerly ea791b5ca5] [formerly 271120a82cffba35438f0b9830c3a47c736fcb73 [formerly bf42c8d740]]
Former-commit-id: 966b34bc10a6cb76f151b577b0acae7fb953d804 [formerly 5b11e45636]
Former-commit-id: a06db5a4e7
|
2014-04-30 17:38:28 -05:00 |
|
Nate Jensen
|
c3ff2e1ad4
|
Merge "Issue #2860 - Fix to not create empty substitution tags" into omaha_14.3.1
Former-commit-id: 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly 580a95ed41 [formerly f6f9169aef] [formerly 1eade4f434] [formerly f005d2f31c [formerly 1eade4f434 [formerly aebaae7802e5429eed3ebc39ae9be45568912d8a]]]]
Former-commit-id: f005d2f31c
Former-commit-id: 299cb28462 [formerly a6df4bd2b2] [formerly 32bb783c21f96ad95b5837b59bfa30c95ba65a23 [formerly b98328113b]]
Former-commit-id: 9716e295e2aaeb50ef7f01c9a4b5eed9b69ac807 [formerly 9b3282fabf]
Former-commit-id: bf92253e0f
|
2014-04-30 15:16:11 -05:00 |
|
Ben Steffensmeier
|
3a60f93af0
|
Issue #2946 Fix auxillary purge rules.
Former-commit-id: 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 8449ec8f22 [formerly bcc02476c6] [formerly 2850d80610] [formerly 4c06cd6f5e [formerly 2850d80610 [formerly a62bdff82f96e79737269686598687ecef746c01]]]]
Former-commit-id: 4c06cd6f5e
Former-commit-id: 410b30ef15 [formerly 076165515a] [formerly a295c948db1f2e4e6f82577553e64171a8f2dc5a [formerly e51a0dcb13]]
Former-commit-id: ab8dc894e2ec9095c6047bed69f4981b7f63857d [formerly 749e7fa56d]
Former-commit-id: c92d5785c9
|
2014-04-30 14:38:27 -05:00 |
|
Nate Jensen
|
a11f0d304c
|
Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly acfcaea04e [formerly 2d19ee46e5] [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 8cbea21f32 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 65ad418a94 [formerly 9a2c674142] [formerly 94b4ede51617e66b1e18ddaa60775457c6b2c3ad [formerly a33ca4e3ac]]
Former-commit-id: 3b5d2fc28c192ce41c0bfe1d25e5582a85ee8e04 [formerly 58618a1842]
Former-commit-id: eb5dd811ca
|
2014-04-30 13:08:26 -05:00 |
|
Brian.Dyke
|
f4856aae4d
|
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
|
2014-04-30 12:57:09 -04:00 |
|
Steve Harris
|
64492a05dc
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these moved to ufcore):
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/AbstractDbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapQueryFactory.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DbPointMapResource.java
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/rsc/DefaultDbMapQuery.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/VizApp.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.ui.menus/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/jts/JTSCompiler.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ImagingDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/ListSelectionDlg.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.dataplugin.maps/src/com/raytheon/uf/common/dataplugin/maps/dataaccess/util/MapsQueryUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/poesDif11u3_7uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u12uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u13uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDif11u3_9uIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satDivWVIR.xml
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDif11u3_9uIR.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDifference.py
edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/functions/satDivWVIR.py
edexOsgi/com.raytheon.uf.common.dataplugin/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginProperties.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Slice.py
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/DerivedLevelNode.java
edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/tree/OrLevelNode.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/ReferencedGeometry.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpace.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/TimeAndSpaceMatcher.java
edexOsgi/com.raytheon.uf.common.inventory/src/com/raytheon/uf/common/inventory/data/AbstractRequestableData.java
edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
edexOsgi/com.raytheon.uf.common.localization/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/region/RegionLookup.java
edexOsgi/com.raytheon.uf.common.message/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/WsId.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/JUtilHandler.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SizeUtil.java
edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/SystemUtil.java
edexOsgi/com.raytheon.uf.edex.auth/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.auth/build.properties
edexOsgi/com.raytheon.uf.edex.auth/res/spring/auth-common.xml
edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteRequestRouteWrapper.java
edexOsgi/com.raytheon.uf.edex.core/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/dataplugin/PluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/res/spring/database-common.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabaseClassAnnotationFinder.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/DatabasePluginRegistry.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/cluster/handler/SharedLockHandler.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginFactory.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/processor/IDatabaseProcessor.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/query/DatabaseQuery.java
edexOsgi/com.raytheon.uf.edex.distribution/res/spring/distribution-spring.xml
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel.launcher/src/com/raytheon/uf/edex/esb/Main.java
edexOsgi/com.raytheon.uf.edex.esb.camel/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/StringToFile.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/jms/DedicatedThreadJmsComponent.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/spring/JmsThreadPoolTaskExecutor.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-request.xml
edexOsgi/com.raytheon.uf.edex.ingest/src/com/raytheon/uf/edex/ingest/notification/PluginNotifier.java
edexOsgi/com.raytheon.uf.edex.purgesrv/res/spring/purge-spring.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-ingest.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 6a80bc2971 [formerly 7f3a19cd1f] [formerly 5a3c6a11c2] [formerly 3380a1dba0 [formerly 5a3c6a11c2 [formerly 505635792772e5f261f47fd980f33d371c8dbfcc]]]]
Former-commit-id: 3380a1dba0
Former-commit-id: 103318357b [formerly 6ad5b5a9d7] [formerly ba5d0a9ff7373ccedcbbb73791d2d7a098c2ff8e [formerly f168d3dddb]]
Former-commit-id: 8ccde1991c055590b9341bfb6729666eea087e32 [formerly 98b93e364e]
Former-commit-id: d214c3174d
|
2014-04-30 11:22:22 -05:00 |
|
Mike Duff
|
458bcee21e
|
Issue #2860 - Fix to not create empty substitution tags
Change-Id: I6734c61103b5bf9db3c27adfe0305cb5eb60d4ff
Former-commit-id: 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly 2b1116f380 [formerly 90895cf316] [formerly 60bfadd865] [formerly c0b2a19a2f [formerly 60bfadd865 [formerly ecd5428e2adad5a0b8022d4a89a13a5a4d549dc1]]]]
Former-commit-id: c0b2a19a2f
Former-commit-id: e5572a5cd0 [formerly 1e84cb07c2] [formerly b8d16c9b3441a0ac07d22e0891f1c3ff651d8b8d [formerly 0601068b03]]
Former-commit-id: 51a58accf1071311a755ab513c7f0bd32f4500c0 [formerly 927e8ffcbb]
Former-commit-id: ac6147c463
|
2014-04-30 10:17:56 -05:00 |
|
Richard Peter
|
ae3f94e875
|
Merge "Issue #3081 Use alias in derived paraemters less." into omaha_14.3.1
Former-commit-id: 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 15d4373fa5 [formerly 74b2cdfe34] [formerly 4ae87dcece] [formerly 9dafb3b9e3 [formerly 4ae87dcece [formerly 8a391cdc5dd83088eeb22ebe6ad17e5aefc72cf0]]]]
Former-commit-id: 9dafb3b9e3
Former-commit-id: 3c2ff2733b [formerly f381290ed1] [formerly 87db6e727009d9903d97b834ac5727197c5c6117 [formerly 9663a83d1f]]
Former-commit-id: 113b0b8e619130b9ec6b0fe3a7c274afee04d1dd [formerly 1488bb27f8]
Former-commit-id: 6668196c3d
|
2014-04-29 16:14:52 -05:00 |
|
Steve Harris
|
66ee7213aa
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
Former-commit-id: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]]
Former-commit-id: af7fb01f53
Former-commit-id: bb335fd675 [formerly 9b65077ad9] [formerly aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]]
Former-commit-id: 0e3911d76550ba99a7aa266f7b2ddff9d81644f3 [formerly 04f12dbaca]
Former-commit-id: 8860d8e6e7
|
2014-04-29 16:09:07 -05:00 |
|
Ben Steffensmeier
|
fda1c02fb1
|
Issue #3081 Use alias in derived paraemters less.
Former-commit-id: fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly fe893aa216 [formerly fe5d69c896] [formerly 1d38fb2df1] [formerly 60a7f64a5e [formerly 1d38fb2df1 [formerly cdbfab27991a9536e48436c084801eb507322e7c]]]]
Former-commit-id: 60a7f64a5e
Former-commit-id: 57f185dd72 [formerly f31d7f826b] [formerly 597f015753893b012533c8d051366fb27a6f6d18 [formerly 539a32666b]]
Former-commit-id: da9381bf6b755d77e05b1e421abebbb397ec6947 [formerly d4d1e28775]
Former-commit-id: b2c93dda87
|
2014-04-29 15:43:08 -05:00 |
|
Ben Steffensmeier
|
9197afe1d2
|
Issue #3080 add NaN conversion to Slice.py
Former-commit-id: 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 96ebfc4ae9 [formerly eb9a0398df] [formerly 156c25fb9c] [formerly 5959b17732 [formerly 156c25fb9c [formerly 084a209f64cf9deb527414500c368ea397b9e3a4]]]]
Former-commit-id: 5959b17732
Former-commit-id: 08442c513a [formerly 8a1b16d15e] [formerly b1afe65ee8b094ce8f0e0dd9ca0140878d1a13d8 [formerly ca8cd9fb43]]
Former-commit-id: 3115849b6ade83f809adceb6ed06ab2f79e71325 [formerly 3be0087fb9]
Former-commit-id: af80e94349
|
2014-04-29 15:35:29 -05:00 |
|
Roger Ferrel
|
be6b9a2db6
|
Issue #3036 Added check for archive's root directories.
Former-commit-id: fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly fa703c0060 [formerly 039e4b5209] [formerly 7a2775ecbc] [formerly 3259d4d44d [formerly 7a2775ecbc [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]]]]
Former-commit-id: 3259d4d44d
Former-commit-id: a447baa5a0 [formerly 39f7eb1ecc] [formerly c60f0141107a305c80631ce1cee234f0b2f3d1d4 [formerly f71aee1e36]]
Former-commit-id: 5be90d0016ef7703bbda9ec332f33b977a87956f [formerly d9015cddb4]
Former-commit-id: 6751691433
|
2014-04-29 14:15:11 -05:00 |
|
Brian Clements
|
f23d3ea0b9
|
Issue #2906 added close to BUFR parser
close netcdf file to solve NFS clean issue
Former-commit-id: c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly c0aef972af [formerly abb14c67e7] [formerly 5beb3be2e8] [formerly a1e416da97 [formerly 5beb3be2e8 [formerly 9675e997369e39455aacadcd72d0d8476f6c7ffc]]]]
Former-commit-id: a1e416da97
Former-commit-id: ad5be1cf6a [formerly 9f1856a6f0] [formerly 1db57f8f23775052064fa72045bb94286cb51a8a [formerly a2c0ba7f0b]]
Former-commit-id: 5477acd025c32c871813f6cc7da0b7a66884ce37 [formerly f03c6cdcf9]
Former-commit-id: 3c8a573a48
|
2014-04-29 13:48:00 -05:00 |
|
Brian.Dyke
|
2e187af9e4
|
Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
|
2014-04-29 12:07:21 -04:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|
Steve Harris
|
a0d412c9d1
|
Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss
Change-Id: I1ff27e7a023ebaad66cd4a82a2e0fea395c7d3a2
Former-commit-id: 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly 1033e0fde7 [formerly 2be0e7730f] [formerly 7b56fb23a8] [formerly c4597ec58b [formerly 7b56fb23a8 [formerly ab93e85eb2181446576be5d58062e1c661d4ec98]]]]
Former-commit-id: c4597ec58b
Former-commit-id: 1266b9438f [formerly 9ef44d2a4c] [formerly 21bcb7ea12e3aa6614573b6302c5937f0be904d4 [formerly 7c44a9506c]]
Former-commit-id: 5539a63dbf2d0f395168e771e37c63ed6f8c5480 [formerly 983efa8dd3]
Former-commit-id: 567730e595
|
2014-04-28 16:25:21 -05:00 |
|
Steve Harris
|
aef4dafa7d
|
Omaha #3085 - moved common.derivparam.python, common.inventory, common.wxmath to core
Former-commit-id: 0f0f8a5ee2 [formerly 99a987c980] [formerly de5a81fa6e] [formerly 0f0f8a5ee2 [formerly 99a987c980] [formerly de5a81fa6e] [formerly a3618cb714 [formerly de5a81fa6e [formerly 786f3c846b23ff201d32f552ed240f1e97acace4]]]]
Former-commit-id: a3618cb714
Former-commit-id: 98d024336d [formerly 36572c3681] [formerly b0eec809b52563ccffa698ac75278b9e18b2151c [formerly 0d33195f0c]]
Former-commit-id: 5d4a11f22001b08539b4a01b104178f6b5f6ffe0 [formerly c7ac81b0cc]
Former-commit-id: 51712fe90b
|
2014-04-28 14:41:41 -05:00 |
|
Dave Hladky
|
31e6954167
|
Issue #2940 Better error message for bad XMRG config in FFMP
Former-commit-id: a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly a0a4085459 [formerly dc3b99cbf4] [formerly 2f4c0cd364] [formerly 82be445e97 [formerly 2f4c0cd364 [formerly dfa3f534b96852975afcd13a6bed653b0f3b8f40]]]]
Former-commit-id: 82be445e97
Former-commit-id: c4212d6252 [formerly 0ea0313cb8] [formerly 5da6cb0fddc03077fb72a39deee5bf043b26cdcb [formerly 3df985a26a]]
Former-commit-id: 16e764fba29e55076fcc6ab1f0cab2f135cb0a91 [formerly a6743a220a]
Former-commit-id: 47d7ed5017
|
2014-04-28 11:04:35 -05:00 |
|
Steve Harris
|
47be791233
|
Omaha #3085 - Removed ufcore and ufcore-foss plugins
Former-commit-id: 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 8fae55b404 [formerly 03e7d5d06f] [formerly a89621797d] [formerly 491b768204 [formerly a89621797d [formerly 5dacfcc17cf99c604c0d4d2669c0aab962eca3ca]]]]
Former-commit-id: 491b768204
Former-commit-id: 1e989b1639 [formerly 558686f2fd] [formerly 85fa8d3f761f8d88d8e3d58caaba110e85d03595 [formerly 23e542e36b]]
Former-commit-id: 1ddc49314076d4b7f8cc758bd55e27897368ca0a [formerly b19a9c9aa8]
Former-commit-id: dd3da741ef
|
2014-04-28 09:59:23 -05:00 |
|
Richard Peter
|
67a38126d0
|
Merge "Issue #3000 fix common.dataplugin.bufrmos manifest" into development
Former-commit-id: dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly dd3a378a6a [formerly 5a0083987b] [formerly 98b35d30c0] [formerly b06172a798 [formerly 98b35d30c0 [formerly d338c2ad7562c6c86915c9e95d2aeca35d401586]]]]
Former-commit-id: b06172a798
Former-commit-id: d45dae2155 [formerly c7882721b2] [formerly 5bda710ce91c29365a5685d0cfa858a81e171800 [formerly f5f6ff0008]]
Former-commit-id: 6f48441c6373c0ec087caa69ab0464b5070630aa [formerly bac20bb9dd]
Former-commit-id: 4ac0d62d7c
|
2014-04-25 14:57:51 -05:00 |
|
Nate Jensen
|
2f39b6eb88
|
Merge "Issue #2629: Update capture to grab Xorg log files." into development
Former-commit-id: 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 23487630e4 [formerly d425f134ae] [formerly 4842f08165] [formerly 9a46583271 [formerly 4842f08165 [formerly 4dc1938de1bd30ac5223a1c0a6748139454ddc2e]]]]
Former-commit-id: 9a46583271
Former-commit-id: a847ecddfa [formerly 1d6014f363] [formerly 40b297f2098fb561c5a1c6c26494e2f2273f285a [formerly acfc3c2b20]]
Former-commit-id: 94e69def4d9c026f69b3aa3df39355f486b5e5fe [formerly ac0b4dc1f2]
Former-commit-id: 8f87fdc431
|
2014-04-25 14:57:47 -05:00 |
|
Richard Peter
|
cfd219f2bb
|
Issue #2726: Make SmartInit shutdown more gracefully
Change-Id: I1a5514e75645083a1d8fa8a771ac33ea8fd39fe7
Former-commit-id: 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 06d58b0472 [formerly 1781500740] [formerly 36742a30f3] [formerly 6918dc0026 [formerly 36742a30f3 [formerly 93f8af097d2a04e054e1c3d0ae0b7d62ca30892e]]]]
Former-commit-id: 6918dc0026
Former-commit-id: 4e1a30b4d9 [formerly 433d5a77f6] [formerly e1f4de7e6f2ee07e043c48c470ad8d5b1a46686a [formerly 52e821b5bb]]
Former-commit-id: 983a1eeebf0004a7badd7ac01293b0008554a0e2 [formerly 5a49b7e345]
Former-commit-id: 6775b0dce6
|
2014-04-25 14:53:22 -05:00 |
|