Commit graph

302 commits

Author SHA1 Message Date
Steve Harris
e0986cfda8 13.4.1-4 baseline
Former-commit-id: d33e5861aa [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7828293d32
2013-05-02 10:00:38 -05:00
Steve Harris
7e923539d5 13.4.1-3 baseline
Former-commit-id: 54afedf617 [formerly 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]
Former-commit-id: 86e96f378c
Former-commit-id: 8a41dd2048
2013-04-29 12:25:07 -05:00
Steve Harris
c0481dcdf2 13.4.1-2 baseline
Former-commit-id: 52f0ae4758 [formerly 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]
Former-commit-id: 5ebd58a0b3
Former-commit-id: 99bc8c8072
2013-04-24 17:22:10 -05:00
Steve Harris
4001e050e7 13.4.1-1 baseline
Former-commit-id: 2f517b7713 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 00332e6305
Former-commit-id: 4accbb80db
2013-04-24 17:15:55 -05:00
Steve Harris
01dfc19f60 Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 7957c52dec [formerly 7957c52dec [formerly 59bd064351a843fd514514de9dc942d13c6d7793]]
Former-commit-id: e6d37f3e6d
Former-commit-id: ad51361408
2013-04-15 09:34:45 -05:00
Steve Harris
44cd8d47fb 13.3.1-20 baseline
Former-commit-id: 25432cc388 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]
Former-commit-id: 446bec6f49
Former-commit-id: 4b71131386
2013-04-15 08:58:59 -05:00
Steve Harris
7d76371536 13.3.1-19 baseline
Former-commit-id: 9be238bcc4 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: abaf9f12f9
Former-commit-id: 340a2cfb23
2013-04-09 08:37:12 -05:00
Steve Harris
f0918ec8ad Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18

Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.product.awips/awips.product
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py

Former-commit-id: ea34b1db1e [formerly ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: d98a119f4d
Former-commit-id: 1a91fd82ff
2013-04-04 11:12:22 -05:00
Steve Harris
eb5258f043 13.2.1-21 baseline
Former-commit-id: d4358b93dc [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: 33bd359cfe
Former-commit-id: 18d6fa4f4d
2013-04-03 18:08:41 -04:00
Steve Harris
9c51f2d15f 13.2.1-20 baseline
Former-commit-id: 6a55bc5dff [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 539faf0a71
Former-commit-id: 12d4316b3a
2013-04-03 18:05:39 -04:00
Steve Harris
044912d48b 13.3.1-18 baseline
Former-commit-id: a2b098d86d [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: ce6a06a7e3
Former-commit-id: bf6c3b6762
2013-04-03 14:58:29 -05:00
Steve Harris
50becef97f 13.3.1-17 baseline
Former-commit-id: 7bf9966dcb [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
c53a305b1e 13.3.1-16 baseline
Former-commit-id: 51380726d4 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 3066dd33e5
Former-commit-id: 36a4b3eb51
2013-04-01 11:39:08 -05:00
Steve Harris
4204273f21 13.3.1-15 baseline
Former-commit-id: eb1dab3864 [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00
Steve Harris
999eb26cec 13.2.1-19 baseline
Former-commit-id: bebd9ad1f4 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]
Former-commit-id: fc859547f8
Former-commit-id: a83eddfe7b
2013-04-01 10:11:24 -04:00
Steve Harris
efadc571ca 13.3.1-14 baseline
Former-commit-id: c29076949e [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]
Former-commit-id: 4d4234d5c9
Former-commit-id: c0737a6022
2013-03-27 22:10:03 -05:00
Steve Harris
8237fdadaa 13.3.1-14 baseline
Former-commit-id: 9022c500ce [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
2013-03-27 17:59:34 -05:00
Steve Harris
7aa4f7b265 13.3.1-13 baseline
Former-commit-id: c77a452f5a [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Steve Harris
f1d156779a 13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Steve Harris
b5e3a7dda6 13.3.1-11 baseline
Former-commit-id: 9cdd90e382 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 373d13df39
Former-commit-id: d868003067
2013-03-25 13:20:03 -05:00
Steve Harris
f2cc967a4f 13.3.1-10 baseline
Former-commit-id: 073687d9a9 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 7078eec1b1
Former-commit-id: 7c2e617d26
2013-03-20 15:53:01 -05:00
Steve Harris
ac2293f08b 13.2.1-18 baseline
Former-commit-id: 3fd5612f89 [formerly 3fd5612f89 [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]]
Former-commit-id: f52a716b3f
Former-commit-id: 72edfa459b
2013-03-20 16:46:35 -04:00
Steve Harris
65f522fc87 13.3.1-9 baseline
Former-commit-id: 468ae82305 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
2013-03-19 14:22:56 -05:00
Steve Harris
0c94cc97fb 13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
2013-03-18 15:43:32 -05:00
Steve Harris
d19ddc9f9b 13.2.1-17 baseline
Former-commit-id: 43aa54dc4c [formerly 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]
Former-commit-id: e3e250c817
Former-commit-id: 6bfab62991
2013-03-18 13:01:37 -04:00
Steve Harris
eae2379163 13.2.1-16 baseline
Former-commit-id: a75fe06bfe [formerly a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]
Former-commit-id: ef031e34df
Former-commit-id: 7915f0ce01
2013-03-18 12:57:34 -04:00
Steve Harris
877b87c2ce 13.2.1-15 baseline
Former-commit-id: 7b52d3eb6e [formerly 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]
Former-commit-id: 7617a2437f
Former-commit-id: 29c9d5a170
2013-03-18 12:53:04 -04:00
Steve Harris
7d7fe21803 13.2.1-14 baseline
Former-commit-id: 00ce32ea21 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]
Former-commit-id: af22cfad98
Former-commit-id: d8775866a6
2013-03-18 12:46:46 -04:00
Steve Harris
3084a860cd 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
2013-03-13 09:50:28 -05:00
Steve Harris
c038384685 13.3.1-6.1 baseline
Former-commit-id: fa9d260c2b [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: a062803c8c
Former-commit-id: bfa25f3330
2013-03-13 08:28:26 -05:00
Steve Harris
c6f379f59a 13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Steve Harris
caf1606e62 13.2.1-13 baseline
Former-commit-id: 088e318fda [formerly 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]
Former-commit-id: 94fa707724
Former-commit-id: 0706fce85c
2013-03-11 11:55:20 -04:00
Steve Harris
1253c1e837 13.2.1-12 baseline
Former-commit-id: 23a41ad607 [formerly 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]
Former-commit-id: de136aad72
Former-commit-id: e71ef2b835
2013-03-07 13:43:04 -05:00
Steve Harris
1f98e01c57 13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
2013-03-05 10:47:06 -06:00
Steve Harris
0df35cc5ec 13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
2013-03-05 10:39:59 -06:00
Steve Harris
f3b395b8cb 13.2.1-11 baseline
Former-commit-id: 41dc7c0396 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]
Former-commit-id: 0684d77845
Former-commit-id: 9cc1613b50
2013-03-04 17:34:39 -05:00
Steve Harris
f14049cf3f 13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1

conflicts resolved by 'theirs' strategy (all of 13.3.1-10)

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: cf951785c8 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: db761c0f19
Former-commit-id: 62e15dacdb
2013-02-25 15:54:24 -06:00
Steve Harris
1ba778753f 13.3.1-3 baseline
Former-commit-id: 6572452887 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
2013-02-25 10:24:53 -05:00
Steve Harris
2a2a9e03b7 13.3.1-2 baseline
Former-commit-id: df6d6f598e [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
2013-02-25 10:18:36 -05:00
Steve Harris
5bb603608e 13.2.1-10 baseline
Former-commit-id: 48ebd10390 [formerly 48ebd10390 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]
Former-commit-id: acf2f8ff92
Former-commit-id: 525d04621d
2013-02-25 10:11:00 -05:00
Steve Harris
654f15be5c 13.3.1-1 baseline
Former-commit-id: 0563d7ac18 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
2013-02-21 09:36:59 -05:00
Steve Harris
8c5659e589 13.2.1-8 baseline
Merge commit '1da0393' into master_13.3.1

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 7f2b4a8092 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 2f7bf90856
Former-commit-id: a723531b31
2013-02-21 09:25:27 -05:00
Steve Harris
b3b56830b0 13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Steve Harris
8b6842526e 13.2.1-9 baseline
Former-commit-id: a339cfb704 [formerly a339cfb704 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]
Former-commit-id: d6dc4694f0
Former-commit-id: 03e04cbcca
2013-02-20 14:11:20 -05:00
Steve Harris
38328aed51 Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: 1b631ebb9a [formerly 1b631ebb9a [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]
Former-commit-id: b29c0b805f
Former-commit-id: 15e9481838
2013-02-18 12:39:53 -06:00
Steve Harris
edac913af7 13.2.1-8 baseline
Former-commit-id: f81b382c04 [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
2013-02-18 09:09:41 -06:00
Steve Harris
7b6e374314 13.2.1-8 baseline
Former-commit-id: 27d88edcb9 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
2013-02-18 09:23:06 -05:00
Steve Harris
7b923d1891 13.2.1-7 baseline
Merge branch 'master_13.2.1' into master_13.3.1

Conflicts solved with 'theirs' strategy (all of 13.2.1-7)

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: a53a44d42c [formerly a53a44d42c [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]
Former-commit-id: d9028f55d3
Former-commit-id: 5bf55de767
2013-02-14 13:55:35 -06:00
Steve Harris
ba12b38550 13.1.1-10 baseline
Former-commit-id: 06d0e6dd16 [formerly 06d0e6dd16 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: c8c783f128
2013-02-14 13:24:43 -06:00
Steve Harris
e0dc0fbfcc 13.1.1-10 baseline
Former-commit-id: 56a36af0c2 [formerly 56a36af0c2 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]
Former-commit-id: 986c332e69
Former-commit-id: fa962f98a4
2013-02-14 14:11:00 -05:00