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

1583 commits

Author SHA1 Message Date
Lee Venable
034e16baa7 Merge "Issue #1790 Changes for non-blocking StationListDlg." into development 
Former-commit-id: 2875600910 [formerly 2875600910 [formerly 4dad96cbc70936f43a65519eff70ac72c904c9e5]]
Former-commit-id: 0bfc05ce61
Former-commit-id: 3d683e98a9
 2013-04-01 09:40:59 -05:00
Roger Ferrel
9e3bee6562 Issue #1790 Changes for non-blocking StationProfileDlg. 
Change-Id: I669c9115dd1bb506acd025a451163aaf664593ef

Former-commit-id: 0d269691e2 [formerly 0d269691e2 [formerly 57eb492610a3cc2974badc6072c2a026f5640b79]]
Former-commit-id: d21cb5e2e8
Former-commit-id: 944d03615e
 2013-03-29 17:11:02 -05:00
Ben Steffensmeier
b3245f7a5d Issue #1799 fix modal tools again. 
Former-commit-id: eeeede7288 [formerly eeeede7288 [formerly c1a69f88df85478571394c0e125617c93100168d]]
Former-commit-id: 66af8daa11
Former-commit-id: 7082466303
 2013-03-29 14:30:54 -05:00
Roger Ferrel
99ebeac6fd Issue #1790 Changes for non-blocking StationListDlg. 
Change-Id: Ib0cbfd64fca2d4dcbea68b5e0db8b34a5a7af6be

Former-commit-id: c5a95dcb44 [formerly c5a95dcb44 [formerly 5d68d67451c45d38a962f58c246b2effcd0cc253]]
Former-commit-id: 6ad80607bc
Former-commit-id: de02460b11
 2013-03-29 13:46:51 -05:00
Roger Ferrel
c1ffc82920 Issue #1790 Last of the bug fixes. Reviewer changes 
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 8f4492c63c [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 463407a40e
Former-commit-id: ec5f32aec6
 2013-03-29 11:35:08 -05:00
Ron Anderson
41b0758084 Issue #1838 Fixed selected time range when Select Grids When Stepping is enabled. 
Change-Id: I30417042d568e6471f8a684fab8bcc2387618089

Former-commit-id: 0f4fb125b0 [formerly 0f4fb125b0 [formerly 3a3f0a47ac33d19259cfc447b0abedd9930e2c64]]
Former-commit-id: c7cfcf0250
Former-commit-id: 9cfa87f7e5
 2013-03-29 10:48:26 -05:00
Nate Jensen
a6a81a17d6 Merge "Issue #1774 Fix D2D accumulative parameter time ranges" into omaha_13.3.1 
Former-commit-id: 214b2ed4ba [formerly 214b2ed4ba [formerly d14cbd8b4a99316bbbf015e1392a34f63a1082d6]]
Former-commit-id: 1bf37125c4
Former-commit-id: 711fbe98d2
 2013-03-28 17:02:14 -05:00
Ben Steffensmeier
a5e1593213 Issue #1799 fix activation of tools for new perspectives. 
Former-commit-id: 50a276a7e2 [formerly 50a276a7e2 [formerly a4c1e2f9526efa227b246b8dc4df9cb00566def1]]
Former-commit-id: 4efa92ff49
Former-commit-id: a415fb17ae
 2013-03-28 15:47:36 -05:00
Ron Anderson
5eb1885dbd Issue #1774 Fix D2D accumulative parameter time ranges 
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1

Former-commit-id: 5bb47b7931 [formerly 5bb47b7931 [formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]
Former-commit-id: b65ecfc151
Former-commit-id: 3f2fa771d9
 2013-03-28 13:37:29 -05:00
Max Schenkelberg
223f946b90 Issue #1638 Fix merge error 
Change-Id: Id75f4d6372cd77132bad82029cfb176ec4f19712

Former-commit-id: 573b441662 [formerly 573b441662 [formerly 9c7c89f148adba714839f9ff4fa9bdda10f0edc0]]
Former-commit-id: 2b58e3ce3f
Former-commit-id: c9301b75ea
 2013-03-28 10:20:54 -05:00
Lee Venable
adbaebd457 Merge "Issue #1790 Bug fixes for SCAN." into development 
Former-commit-id: e7805ded92 [formerly e7805ded92 [formerly 657dace6ad43e57bfcb99deb14717ce893bd9710]]
Former-commit-id: 167fa6eadf
Former-commit-id: 772bbe23a7
 2013-03-28 10:04:34 -05:00
Roger Ferrel
3bb55722f5 Issue #1790 Bug fixes for SCAN. 
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 9c560ab626 [formerly 9c560ab626 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]
Former-commit-id: e204276c17
Former-commit-id: 216fa1b23b
 2013-03-28 09:16:24 -05:00
Roger Ferrel
c354469c78 Issue #1790 bug fix for GFE dialogs in ticket 1353. 
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612

Former-commit-id: 98d056c3a1 [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]
Former-commit-id: 4db9e20fbf
Former-commit-id: b95a38db32
 2013-03-28 09:04:10 -05:00
Steve Harris
90ec2d3fbf Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 9a321b6ac8 [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 3073951b3d
Former-commit-id: a4bf236cc7
 2013-03-27 22:16:15 -05:00
Roger Ferrel
36219d5090 Issue #1790 Bug fix for dialogs in ticket 1578 
Change-Id: I472e20ca729d0c4f3510bdd98e5456be47bd2c90

Former-commit-id: a8410499bc [formerly a8410499bc [formerly 9bc7fe4c771e534148b446d33de969ef53be3b0d]]
Former-commit-id: 1129728e03
Former-commit-id: 56ca204764
 2013-03-27 21:54:26 -05:00
Steve Harris
f3a84e952e Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: 2a0e399dc8 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: d997aeaee4
Former-commit-id: e67b16bb03
 2013-03-27 18:21:05 -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
Roger Ferrel
1b74b2d4a4 Issue #1790 Bug fixes for ticket 1353. 
Change-Id: I36b74546b7f73c669d65a5588e813173ccbd18fc

Former-commit-id: 04b57a8582 [formerly 04b57a8582 [formerly e0c3e3b81f679985a048047b3e5aa69992577d78]]
Former-commit-id: 391ce5687b
Former-commit-id: 726b5de0c5
 2013-03-27 16:56:17 -05:00
Dustin Johnson
c5685dbe9f Issue #1827 Create registry/datadelivery client features 
Amend: Add event plugins and their dependencies to client features

Change-Id: Ib80522161740857d4332b84bbedad10e19683602

Former-commit-id: 52c27ec57f [formerly 52c27ec57f [formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 1684507bdb
Former-commit-id: f27ebfbc1b
 2013-03-27 15:38:36 -05:00
Roger Ferrel
d504643687 Issue #1790 Fix dialog in current phase. 
Change-Id: I7289fbef264d68b70b606d120cde8daf5fc41e7b

Former-commit-id: d69674d595 [formerly d69674d595 [formerly 0c1b97f64455c8fcbe2c12848c3a4f58d1d13b54]]
Former-commit-id: 1093c020e6
Former-commit-id: 68ba7cab75
 2013-03-27 14:11:36 -05:00
Nate Jensen
9c7466b8e9 Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development 
Former-commit-id: faf937d3b0 [formerly faf937d3b0 [formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]
Former-commit-id: f8e5534417
Former-commit-id: a7548df695
 2013-03-27 11:32:19 -05:00
Nate Jensen
9353bd7d8b Merge "Issue #1735 Performance improvments for LLWSData." into development 
Former-commit-id: ff7631d847 [formerly ff7631d847 [formerly 5ee7c58ea1f95b89bf252edbee02d0560eaa98aa]]
Former-commit-id: b44db0bc2c
Former-commit-id: 314c5dcb2e
 2013-03-26 16:28:38 -05:00
Nate Jensen
79fddbcbf5 Merge "Issue #1791 Fix problems in SmartScript when there is no data." into omaha_13.3.1 
Former-commit-id: f3fd91c311 [formerly f3fd91c311 [formerly a12ccd946a59dae45a4b5b754655d8eef7a56a29]]
Former-commit-id: c895ee60fa
Former-commit-id: 5701030750
 2013-03-26 16:15:27 -05:00
Lee Venable
f0ed70f9fb Merge "Issue #1799 Fix pan/zoom when in views." into omaha_13.3.1 
Former-commit-id: 1a59204892 [formerly 1a59204892 [formerly 69ec257d3a90ffcaa81d92f34ff545d4c49bb1d3]]
Former-commit-id: 049e955db9
Former-commit-id: f8d2fdacea
 2013-03-26 15:01:51 -05:00
Ben Steffensmeier
b76bdc602d Issue #1791 Fix problems in SmartScript when there is no data. 
Former-commit-id: 6870045005 [formerly 6870045005 [formerly 39d0a9f0cc71f3dbbde69e6d1dac14ef93a78984]]
Former-commit-id: 18311b0d18
Former-commit-id: 69879c51df
 2013-03-26 14:46:11 -05:00
Lee Venable
ea68209a19 Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1 
Former-commit-id: c86daf885b [formerly c86daf885b [formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
 2013-03-26 14:33:24 -05:00
Steve Harris
fdd07bd72c Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 5fcfaf4360 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
 2013-03-26 12:47:40 -05:00
Steve Harris
779adedea9 Merge branch 'master_13.3.1' into omaha_13.3.1 
Former-commit-id: e71c69c383 [formerly e71c69c383 [formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
 2013-03-26 12:44:24 -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
Jonathan Sanchez
cc64195d47 Issue #1819 Added precision fields for point source configuration. 
Former-commit-id: 79d87a96e7 [formerly 79d87a96e7 [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
 2013-03-26 12:29:18 -05:00
Ben Steffensmeier
3dbd9580c5 Issue #1782 fix merge problems related to graphics API. 
Former-commit-id: 2b898e58c7 [formerly 2b898e58c7 [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
 2013-03-26 12:06:45 -05:00
Ben Steffensmeier
69068bbf3a Issue #1799 Fix pan/zoom when in views. 
Former-commit-id: 643c1c77d0 [formerly 643c1c77d0 [formerly 2061956526bdc3da43280e6c829de1deb0a098ba]]
Former-commit-id: 78fdea2ba1
Former-commit-id: 5a1171f111
 2013-03-26 11:44:23 -05:00
Steve Harris
e6ab1deba2 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: fd71e44f0f [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
 2013-03-26 10:12:34 -05:00
Mike Duff
efec4d0365 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.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
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/server/GridParm.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/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: 5d72795e1b [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
 2013-03-26 09:19:39 -05:00
Ron Anderson
60c1c27225 Merge "Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for localVTECPartners.py to ServiceBackup." into omaha_13.3.1 
Former-commit-id: f4f180face [formerly f4f180face [formerly 8394ce66975f5915fd82dbc950ce43e5db3cfbe3]]
Former-commit-id: 73678261b6
Former-commit-id: 7e6b601a09
 2013-03-25 17:53:46 -05:00
Lee Venable
b329abb111 Merge "Issue #1605 Check if storm location is over an urban bound area." into omaha_13.3.1 
Former-commit-id: e467daec0c [formerly e467daec0c [formerly 65989516cda62a95cb7b6d67bea8aa20138def2a]]
Former-commit-id: 05b4c2f913
Former-commit-id: d73b44fa67
 2013-03-25 17:20:25 -05:00
Mike Duff
9a9d8f0503 Issue #1781 - Constrain the tabular TS query by time. 
Change-Id: I648913c157585283cdc96793d18d36933589b3e9

Former-commit-id: afd0de8b5b [formerly afd0de8b5b [formerly 027807d7e4ac171498f267759a4e34f75e1e4d46]]
Former-commit-id: 88e75f4a90
Former-commit-id: b517ce9a9f
 2013-03-25 16:03:18 -05:00
Roger Ferrel
7259166afe Issue #1735 Performance improvments for LLWSData. 
Change-Id: I146250873a90e1a7378a3e910416e03b6d3bf17f

Former-commit-id: feadd01ad9 [formerly feadd01ad9 [formerly 0c067f6bd45f0474708af1715278d21a2a963868]]
Former-commit-id: 549650c05c
Former-commit-id: daecc7b7f4
 2013-03-25 15:41:01 -05:00
Max Schenkelberg
237c742d44 Issue #1638 Made Map scales more generalized for use outside of D2D 
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: fd375314cd [formerly fd375314cd [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]
Former-commit-id: e17d691400
Former-commit-id: 36e80c267e
 2013-03-25 15:38:36 -05:00
Jonathan Sanchez
dad851857d Issue #1605 Check if storm location is over an urban bound area. 
Former-commit-id: 06cd161d0e [formerly 06cd161d0e [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
 2013-03-25 14:41:55 -05:00
Lee Venable
cc0debe027 Merge "Issue #1810 Accepted other values/types for useDirs." into omaha_13.3.1 
Former-commit-id: 25cf1cacfd [formerly 25cf1cacfd [formerly 2e5dbf15665e3c1229604f2ae7cbfd76dacd3903]]
Former-commit-id: d1c84de620
Former-commit-id: fc41aa82ca
 2013-03-25 14:08:39 -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
Jonathan Sanchez
6e02206355 Issue #1810 Accepted other values/types for useDirs. 
Former-commit-id: d00c88a38c [formerly d00c88a38c [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]
Former-commit-id: b77ed18eb4
Former-commit-id: 539c4dfa8e
 2013-03-25 12:23:51 -05:00
Mike Duff
516965bea3 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action 
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 593cb668bf [formerly 593cb668bf [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
 2013-03-24 12:21:51 -05:00
Richard Peter
66a28e9315 Merge "Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe." into development 
Former-commit-id: 1b7e9e41ce [formerly 1b7e9e41ce [formerly a009dd098e1a13ec445cbdc3757771f576d3acc0]]
Former-commit-id: 3de0400969
Former-commit-id: 50254dc8d1
 2013-03-22 16:26:52 -05:00
Dustin Johnson
dcc7e44250 Merge "Issue #1815 Move DD phase3 code to 5-Data_Delivery" into development 
Former-commit-id: dcfbb43eb3 [formerly dcfbb43eb3 [formerly 7a5674416084a17bf2fbbbc666cba01bb7338eff]]
Former-commit-id: 8651ca3d76
Former-commit-id: 0596d43d99
 2013-03-22 15:28:57 -05:00
Dustin Johnson
e4c51bad63 Merge "Issue #1794 Add flag to check whether phase3 data delivery code is available, crude ability to create a shared subscription" into development 
Former-commit-id: 11478e870d [formerly 11478e870d [formerly feee3e80a7b2aafd9ddf1af0802a829726f50a69]]
Former-commit-id: ed017996a0
Former-commit-id: 9e63142576
 2013-03-22 15:28:20 -05:00
Max Schenkelberg
34134b3c62 Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe. 
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: ea26d0de84 [formerly ea26d0de84 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
 2013-03-22 10:54:44 -05:00
David Gillingham
7a2c92efc7 Issue #1447: Add troubleshooting mode to ServiceBackup from A1 DR 21404, add support for 
localVTECPartners.py to ServiceBackup.

Change-Id: Ie91d342c113c59d0e97b86349f75d657f1cf40f3

Former-commit-id: 79a1520baf [formerly 79a1520baf [formerly 0b047a505ce4ed442af9de3a3cfeea5bf1e6c872]]
Former-commit-id: 4aeeb1ce25
Former-commit-id: c3ce4058a0
 2013-03-22 10:39:13 -05:00
Dustin Johnson
e39187c0ce Issue #1815 Move DD phase3 code to 5-Data_Delivery 
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 8956d1ac17 [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]
Former-commit-id: 04cbd3a24e
Former-commit-id: 1b1bd69b89
 2013-03-22 10:04:21 -05:00