xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
24383 commits 31 branches 40 tags 3.8 GiB
Commit graph

125 commits

Author SHA1 Message Date
mjames-upc
c921ec69d6 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
 2015-09-03 15:48:53 -06:00
AWIPS User
7fdb57c96c ui frame increase/d2d for developer.product/test file regex for obs and radar. 
Former-commit-id: 86a579e940 [formerly e3d9d5602f] [formerly 3938673621f8cdfbd6a1e1dca7c3c4db21cccf4e [formerly 7b803d9c61]]
Former-commit-id: f2772294e59c1ecf4b52e77b3c2cf77d3ed54161 [formerly 283ffab705]
Former-commit-id: ceab543656
 2015-06-22 16:00:26 -05:00
David Friedman
e5c867b535 ASM #17563 - Alertviz error thrown at CAVE startup 
Change-Id: Ie4b55fb9b4f9510db6b509d1cb84951703ad65be

Former-commit-id: cfc845d2b5 [formerly 9770cce2f5 [formerly ce93b29318ed33775c5432a3a6d7fe68ba62a48e]]
Former-commit-id: 9770cce2f5
Former-commit-id: e6a3e7b6c7
 2015-06-16 18:48:11 +00:00
Nate Jensen
ad2a20dd43 Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly effb6c68bf [formerly 6c1391e938] [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 3202b579c1 [formerly 1c5057a13f] [formerly fe8f15a6cf651b03c628440d9b584168f73a916a [formerly 291de3f039]]
Former-commit-id: 62ac51e4fd5ddf96d1a40756fde9b064052645f9 [formerly e53063661e]
Former-commit-id: 0bb18f02d0
 2014-12-03 15:47:10 -06:00
Nate Jensen
effb6c68bf Omaha #3549 remove jdt prefs for faster builds 
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 8dbe6abbe4 [formerly ec28d2f1a0 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]
Former-commit-id: ec28d2f1a0
Former-commit-id: 6c1391e938
 2014-12-03 15:47:10 -06:00
Mark Peters
71a0ceee2b Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin 
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348

Former-commit-id: da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly da72adac03 [formerly ffe3444650] [formerly 955f21a85c] [formerly fb62a1e35b [formerly 955f21a85c [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]]
Former-commit-id: fb62a1e35b
Former-commit-id: bb728b015f [formerly 77da058a9f] [formerly 5748026158d68b3743065ea06e8b17228eeefe25 [formerly 6315da5482]]
Former-commit-id: ed0e605da1d6e67998241f168012ead136be8449 [formerly f9d5dca0e5]
Former-commit-id: eda9693e85
 2014-10-02 15:36:22 -05:00
Mark Peters
da72adac03 Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin 
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348

Former-commit-id: fb62a1e35b [formerly 955f21a85c [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]
Former-commit-id: 955f21a85c
Former-commit-id: ffe3444650
 2014-10-02 15:36:22 -05:00
Mark Peters
32aae0aa64 Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: d065b2610f [formerly 68044d2dd7] [formerly 3f1e21107b] [formerly d065b2610f [formerly 68044d2dd7] [formerly 3f1e21107b] [formerly c5da5ccb9b [formerly 3f1e21107b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]]]
Former-commit-id: c5da5ccb9b
Former-commit-id: 5866b1672b [formerly 01fa82955b] [formerly 68f23f587842499a379ea50ee1e7d61c11b6329e [formerly edc2745d1f]]
Former-commit-id: 2cb2c28c4886558bdf857b3cad7623d7c1988033 [formerly 54640500a6]
Former-commit-id: 11a05cae90
 2014-09-19 14:02:54 -05:00
Mark Peters
d065b2610f Omaha #3627 Delete or replace dead or deprecated methods and classes from com.raytheon.uf.edex.decodertools 
Change-Id: I95e881042e09a18f45b4410a76dbcf828dac0d4f

Former-commit-id: c5da5ccb9b [formerly 3f1e21107b [formerly 4632e2694c2d06c6b61ae9b61eee3b3584c6bebc]]
Former-commit-id: 3f1e21107b
Former-commit-id: 68044d2dd7
 2014-09-19 14:02:54 -05:00
Brian Clements
2a7043033c Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: 26ade7cae8 [formerly a7d17bd490] [formerly aa991c9223] [formerly 26ade7cae8 [formerly a7d17bd490] [formerly aa991c9223] [formerly 74a6c3dd20 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]]]
Former-commit-id: 74a6c3dd20
Former-commit-id: d395fc27fc [formerly 5977b049c1] [formerly 53a85ec6b9da7b5e37777469d995ba034e153ce6 [formerly 10ea02b936]]
Former-commit-id: 165edd61e4cf5f8b3c8f4d5abc9d215a41539cc6 [formerly 053cf978a7]
Former-commit-id: 8a256eb228
 2014-07-24 13:45:58 -05:00
Brian Clements
26ade7cae8 Omaha #3410 changed lon/lat fields to floats in sfc and air obs location 
Change-Id: I4c8d47b9f9e598e69309f1aa99bc30c022cae7af

Former-commit-id: 74a6c3dd20 [formerly aa991c9223 [formerly cdb0a72fcb2345564f2b944fdecd7869fd498767]]
Former-commit-id: aa991c9223
Former-commit-id: a7d17bd490
 2014-07-24 13:45:58 -05:00
Nate Jensen
266d148803 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 0556146804 [formerly 6077794cc9] [formerly 9219e1e254] [formerly 0556146804 [formerly 6077794cc9] [formerly 9219e1e254] [formerly 53633a6ed4 [formerly 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 325e99b711 [formerly 1117e5b995] [formerly 0911e2aed4682ca78820538d0dc0fe963c7ebf04 [formerly 5062338b2d]]
Former-commit-id: e76ebd5fe5ff6d669467f7ad5f3bce7a3a3e32c8 [formerly 3239b1956b]
Former-commit-id: 6d3b2d3119
 2014-06-23 14:13:19 -05:00
Nate Jensen
0556146804 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 53633a6ed4 [formerly 9219e1e254 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]
Former-commit-id: 9219e1e254
Former-commit-id: 6077794cc9
 2014-06-23 14:13:19 -05:00
Steve Harris
3c9f653212 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly f79a449b6b [formerly 376482d3b1] [formerly 518822ed83] [formerly b6af2db9f5 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]]]
Former-commit-id: b6af2db9f5
Former-commit-id: 0fbeb1a165 [formerly 1dfc15a77e] [formerly 7d53b80294c5865df861c5b6db7d9a9380d06252 [formerly 14b1ea307f]]
Former-commit-id: 88f5f48abba58273dd5fee5505a2fe8efb91f86c [formerly d226dfb021]
Former-commit-id: e30dfd21ee
 2014-05-22 14:31:06 -05:00
Steve Harris
f79a449b6b Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
	edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java

Former-commit-id: b6af2db9f5 [formerly 518822ed83 [formerly f8cb49d46f88b801a682a34a3b7056bde1ab2569]]
Former-commit-id: 518822ed83
Former-commit-id: 376482d3b1
 2014-05-22 14:31:06 -05:00
brian.dyke
5c9495ee04 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
 2014-05-19 09:45:37 -04:00
brian.dyke
4d161aaf90 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
 2014-05-19 09:45:37 -04:00
Brian Clements
2a628638f3 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 95a233a3a0 [formerly 437d9bb781] [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: f291884a77 [formerly abd29bf492] [formerly b75f809dcbc407fb62db7fd2cd75e86e51c75269 [formerly ee9757ea39]]
Former-commit-id: 2b23fa6944d3b14df8bcd8b466b79df2877328aa [formerly e9ee0bcbde]
Former-commit-id: 7473191ba6
 2014-05-14 13:45:09 -05:00
Brian Clements
95a233a3a0 Omaha #2536 moved WMO Header into new common plugin 
moved WMO time parsing code from TimeTools to WMOTimeParser


Former-commit-id: 6bd43f79ff [formerly 2b1c7eaa37 [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]
Former-commit-id: 2b1c7eaa37
Former-commit-id: 437d9bb781
 2014-05-14 13:45:09 -05:00
Brian Clements
c0df43a64d Omaha #2733 changes to match ufcore distribution pattern changes 
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 4d2d5f81df [formerly 243ba8476a] [formerly 8b07016f25] [formerly 316bfe3b6f [formerly 8b07016f25 [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]]]
Former-commit-id: 316bfe3b6f
Former-commit-id: 26064a9629 [formerly 546cf300df] [formerly fbf8cffad16b3edb70ad15a4742dcdc5c87e748c [formerly 9cc5ee88b5]]
Former-commit-id: 1acad5dacb5b2d6f53d36dcf979d6af776115058 [formerly a1f23d2c7b]
Former-commit-id: 4a6011ce6c
 2014-05-12 09:14:28 -05:00
Brian Clements
4d2d5f81df Omaha #2733 changes to match ufcore distribution pattern changes 
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns


Former-commit-id: 316bfe3b6f [formerly 8b07016f25 [formerly e917569da8e837a1c340b0e992a0c59f0a3507f3]]
Former-commit-id: 8b07016f25
Former-commit-id: 243ba8476a
 2014-05-12 09:14:28 -05:00
David Friedman
558bfbf161 ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature 
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c

Former-commit-id: a9a6f2fa3d [formerly ad99a4f615] [formerly 3be74c3664] [formerly a9a6f2fa3d [formerly ad99a4f615] [formerly 3be74c3664] [formerly 20c7e2f29d [formerly 3be74c3664 [formerly 8d9e72c309cbcef7b0cd8656333e05202e0a290b]]]]
Former-commit-id: 20c7e2f29d
Former-commit-id: c34a585def [formerly 6384ea3833] [formerly 2133d63ea4890b88c626b163d6eee1a66dbfc553 [formerly 61b7c09d14]]
Former-commit-id: 265bcaeadb6236f4b7ef48a546f2b5e80ae5ee8d [formerly 0275aa3f77]
Former-commit-id: 5bd3b8d47a
 2014-05-12 13:18:50 +00:00
David Friedman
a9a6f2fa3d ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature 
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c

Former-commit-id: 20c7e2f29d [formerly 3be74c3664 [formerly 8d9e72c309cbcef7b0cd8656333e05202e0a290b]]
Former-commit-id: 3be74c3664
Former-commit-id: ad99a4f615
 2014-05-12 13:18:50 +00:00
Richard Peter
5350b3eac8 Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 909571ebca [formerly e4be1f24e7] [formerly dbba727f3d] [formerly 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]]]
Former-commit-id: 17196b5dcd
Former-commit-id: b5fa843960 [formerly ff87317bd4] [formerly f202d7fc11f48792bac7d10cbb20d9ba9077aa8f [formerly 8b279966d1]]
Former-commit-id: b1349363c5b25965107de3827211c7bcc6b9e98b [formerly b3fd8e5480]
Former-commit-id: de624d87d3
 2014-04-14 13:10:11 -05:00
Richard Peter
909571ebca Issue #2726: Edex graceful shutdown. 
Refactored to use inheritance and separate logic where possible.
             Addressed comments.

Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6

Former-commit-id: 17196b5dcd [formerly dbba727f3d [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1]]
Former-commit-id: dbba727f3d
Former-commit-id: e4be1f24e7
 2014-04-14 13:10:11 -05:00
Steve Harris
9c0f484340 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly 865fef97b1 [formerly 51b755a476] [formerly 873bd6b889] [formerly f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]]]
Former-commit-id: f60aba35d6
Former-commit-id: edeb1833ae [formerly c24108e75b] [formerly dd4a41540248d59f726530a16fc9cba204845e67 [formerly 708485427e]]
Former-commit-id: 5762fd74e7f2363c52a036a1f2863c4bad83bfa3 [formerly 61af779433]
Former-commit-id: ed7921643c
 2014-03-07 15:43:40 -06:00
Steve Harris
865fef97b1 Merge branch 'omaha_14.2.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: f60aba35d6 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]]
Former-commit-id: 873bd6b889
Former-commit-id: 51b755a476
 2014-03-07 15:43:40 -06:00
Mike Duff
5f1a4d958d Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly 63937fa7cd [formerly 7fd9cc40c7] [formerly 944fca16b8] [formerly c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]]]
Former-commit-id: c388cb839b
Former-commit-id: a8714addc5 [formerly 12ea05cffc] [formerly 9aea84fb4bf8ca5374b8bd4488c02898ee308de8 [formerly 7bb9ada00d]]
Former-commit-id: 406ecdd8cc99fc4788985b56f135a076f473b981 [formerly efbc53e61f]
Former-commit-id: 8c8a5f739f
 2014-03-07 12:47:46 -06:00
Mike Duff
63937fa7cd Issue #2876 - Pluginize NDM 
review comments

Change-Id: I9911c531a0e2ac735df949cc3f9aa72dc192483d

Former-commit-id: c388cb839b [formerly 944fca16b8 [formerly 2f1aa28a4389c15e20724ebc8d79501c338f565e]]
Former-commit-id: 944fca16b8
Former-commit-id: 7fd9cc40c7
 2014-03-07 12:47:46 -06:00
Steve Harris
a19beb1e5d Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly 52226061e9 [formerly 3ba28aabea] [formerly 069093884f] [formerly ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]]]
Former-commit-id: ffcc34f8d4
Former-commit-id: d2a6b0c18b [formerly 587f15a95d] [formerly 075449ff82fabd2fc67648dd472bd7d35adee380 [formerly 96658d8ce0]]
Former-commit-id: 988fe07191d81cd8942573f69248d26d68d20315 [formerly 36a0533f19]
Former-commit-id: 2db5dcf6eb
 2014-03-06 08:39:43 -06:00
Steve Harris
52226061e9 Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 
merge performed by Richard Peter

Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/MergeHazards.py
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	edexOsgi/build.edex/esb/conf/log4j-ingest.xml
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/log4j.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.deprecated/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring.future/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-distribution.xml
	edexOsgi/com.raytheon.edex.plugin.modelsounding/res/spring/modelsounding-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/AlertalarmStdTextProductUtil.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/alarms/Constants.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
	edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledConnectionFactory.java
	edexOsgi/com.raytheon.uf.common.jms/src/com/raytheon/uf/common/jms/JmsPooledSession.java
	edexOsgi/com.raytheon.uf.edex.cpgsrv/res/spring/cpgsrv-spring.xml
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/res/spring/grid-staticdata-process.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-common.xml
	edexOsgi/com.raytheon.uf.edex.ohd/res/spring/satpre-spring.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncccfp/res/spring/ncccfp-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-distribution.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/res/spring/ncgrib-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncscat/res/spring/ncscat-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ntrans/res/spring/ntrans-ingest.xml
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh

Former-commit-id: ffcc34f8d4 [formerly 069093884f [formerly 889200c9eb3fbb835f8fef067476799f30a7a7e0]]
Former-commit-id: 069093884f
Former-commit-id: 3ba28aabea
 2014-03-06 08:39:43 -06:00
Brian.Dyke
c8111a7ebb OB_14.1.1-21 baseline 
Former-commit-id: 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 5179a4f970 [formerly 271ec85c0c] [formerly 1d92e5bab6] [formerly 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]]]
Former-commit-id: 29681c7ca4
Former-commit-id: c1ef56e0d7 [formerly c68649b4f9] [formerly 146eb0a75db603df40a613354b8cbc0908ec3abb [formerly 7cad374af5]]
Former-commit-id: db6e513aaa9a15a7b11a5aee1b3716c9a5587928 [formerly 079cc93f89]
Former-commit-id: ea56516bf5
 2014-03-04 11:47:42 -05:00
Brian.Dyke
5179a4f970 OB_14.1.1-21 baseline 
Former-commit-id: 29681c7ca4 [formerly 1d92e5bab6 [formerly d220320ed3c6e9a0fe9fe26d83dd71eec6eafa0b]]
Former-commit-id: 1d92e5bab6
Former-commit-id: 271ec85c0c
 2014-03-04 11:47:42 -05:00
Brian.Dyke
de9e6553a9 OB_14.1.1-19 baseline 
Former-commit-id: 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 3508e488f5 [formerly 779553142c] [formerly cfa4997978] [formerly 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]]
Former-commit-id: 10b723647b
Former-commit-id: 5a11fbbfdb [formerly c41dd22ff2] [formerly f52dfb462cf92e04bf51f942fd80bfc621074563 [formerly 64044e7ce5]]
Former-commit-id: 8cf9beeb99ea9f03c45e09f6c11fba57ddab3585 [formerly 1b359c2564]
Former-commit-id: f86f9f8918
 2014-02-21 06:50:59 -05:00
Brian.Dyke
3508e488f5 OB_14.1.1-19 baseline 
Former-commit-id: 10b723647b [formerly cfa4997978 [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]
Former-commit-id: cfa4997978
Former-commit-id: 779553142c
 2014-02-21 06:50:59 -05:00
Ron Anderson
f33f5aec85 Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 2e8cbade9f [formerly 0bde38cef3] [formerly ba7a25a88f] [formerly 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]
Former-commit-id: 62c445d872
Former-commit-id: 46735c9afe [formerly dca7f21f7b] [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25 [formerly 624375267e]]
Former-commit-id: 550b8ecf890edc1befc4cc61d160811052a5c599 [formerly 5076217d8f]
Former-commit-id: 77c132f706
 2014-01-13 17:45:20 -06:00
Ron Anderson
2e8cbade9f Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 62c445d872 [formerly ba7a25a88f [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]
Former-commit-id: ba7a25a88f
Former-commit-id: 0bde38cef3
 2014-01-13 17:45:20 -06:00
Steve Harris
f8f17037ca 14.1.1-14 baseline 
Former-commit-id: 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 94a748fa8d [formerly 6df7c67f95] [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 4a516444b6 [formerly 0989c17710] [formerly 0c5e0a197ceb1a6b84da775143e65603564a8877 [formerly 43cc501e0d]]
Former-commit-id: a6acd13ea8d0052cec52c8cee5a726953d78e66e [formerly a2bdee5cc1]
Former-commit-id: 5862555160
 2014-01-06 14:02:30 -05:00
Steve Harris
94a748fa8d 14.1.1-14 baseline 
Former-commit-id: 9ef1c841b9 [formerly f2ad9da4eb [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]
Former-commit-id: f2ad9da4eb
Former-commit-id: 6df7c67f95
 2014-01-06 14:02:30 -05:00
Richard Peter
f362062048 Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly ba577ff354 [formerly b3b23647b4] [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 530b3bd588 [formerly 60679a818a] [formerly a031ba53197c00cc0956c78c19bfb9d661fb4215 [formerly da027298d4]]
Former-commit-id: 53e9784af497b834229cb70070f6499791f6f567 [formerly fd93b7d85e]
Former-commit-id: ae6e34be4b
 2013-12-05 12:12:27 -06:00
Richard Peter
ba577ff354 Merge branch 'omaha_14.1.1' (14.1.1-11) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	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/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
	msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs

Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a

Former-commit-id: a0b6ea8bb2 [formerly 0c4ae068ad [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]
Former-commit-id: 0c4ae068ad
Former-commit-id: b3b23647b4
 2013-12-05 12:12:27 -06:00
Steve Harris
8a1ea4d35f 14.1.1-10 baseline 
Former-commit-id: 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 69cef95302 [formerly 8251107646] [formerly ca0f65bd9a] [formerly 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]]]
Former-commit-id: 9248695a1f
Former-commit-id: 2c49ed51ac [formerly e35ec60f7e] [formerly 3a680dda0eb4accc0f16a467d0582447a9f8a94f [formerly ef6e0b0304]]
Former-commit-id: 1da4cf492cf27e8f6e06f3cfbfcc4a4b3ce25255 [formerly 36d788890a]
Former-commit-id: ea65181d19
 2013-11-19 16:40:25 -05:00
Steve Harris
69cef95302 14.1.1-10 baseline 
Former-commit-id: 9248695a1f [formerly ca0f65bd9a [formerly 6970b56e5970df5cd40ddfc41470324d652f0afd]]
Former-commit-id: ca0f65bd9a
Former-commit-id: 8251107646
 2013-11-19 16:40:25 -05:00
Steve Harris
2608595d90 14.1.1-7 baseline 
Former-commit-id: 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 21ff310620 [formerly 80614c0e52] [formerly 3328e2dd1d] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed]
Former-commit-id: cfb3194426
 2013-11-06 14:16:14 -05:00
Steve Harris
21ff310620 14.1.1-7 baseline 
Former-commit-id: 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]
Former-commit-id: 3328e2dd1d
Former-commit-id: 80614c0e52
 2013-11-06 14:16:14 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline 
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
 2013-10-28 10:55:16 -04:00
Steve Harris
cb3b53f205 14.1.1-4 baseline 
Former-commit-id: 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: bd95bb6a4e
Former-commit-id: 82dec19b6a
 2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline 
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
 2013-10-28 10:46:02 -04:00
Steve Harris
a0ba2e1252 14.1.1-3 baseline 
Former-commit-id: 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 94f24e0d8a
Former-commit-id: 851f9df229
 2013-10-28 10:46:02 -04:00
Nate Jensen
360066e5b8 Issue #2361 remove dependencies on mesowest and delete dead grichardson code 
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: d2af0d52a6 [formerly 2419a99ac7] [formerly a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]]
Former-commit-id: a2aea41bda81ba451fdb55f8030f7d56d6699493 [formerly c9cdcc056a]
Former-commit-id: 41dab56b49
 2013-10-23 14:52:29 -05:00