Commit graph

1347 commits

Author SHA1 Message Date
Ron Anderson
7a9826a27f Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: 0984f201b2 [formerly 94ec6eaeaf] [formerly 0984f201b2 [formerly 94ec6eaeaf] [formerly 457d55ecdf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]]
Former-commit-id: 457d55ecdf
Former-commit-id: 9d832ad8be [formerly 1157e5a55e]
Former-commit-id: c55588f57c
2012-11-15 11:00:02 -06:00
Steve Harris
ae9d9985cd Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 8fc896f7d4 [formerly 448dd1c35f] [formerly 8fc896f7d4 [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]
Former-commit-id: 00f3d51546
Former-commit-id: 21ecd53719 [formerly c8cac52915]
Former-commit-id: 59efd9a217
2012-11-13 17:28:50 -06:00
Steve Harris
7058ebec23 12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
2012-11-13 17:27:04 -06:00
Steve Harris
53d74c66e7 12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
2012-11-13 17:14:24 -06:00
Lee Venable
4353b75410 Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 2827143110 [formerly 989d5dc5e4] [formerly 2827143110 [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 77af9b8699 [formerly 282e8858da]
Former-commit-id: 5f79e0f562
2012-11-13 16:02:05 -06:00
Steve Harris
81015f6f41 Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 1f1659cb16 [formerly 63b0f18a89] [formerly 1f1659cb16 [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 6db07e2e5e [formerly 1e0ad343d6]
Former-commit-id: 07abe90d1c
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
9f2f2591ee Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.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/purge/PurgeRuleSet.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
	pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc

Former-commit-id: ed4f88aa22 [formerly 69fc030bb4] [formerly ed4f88aa22 [formerly 69fc030bb4] [formerly e8090e654b [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]
Former-commit-id: e8090e654b
Former-commit-id: 109ec1e778 [formerly 60f78c22e3]
Former-commit-id: 7761060a12
2012-11-13 16:00:19 -06:00
Roger Ferrel
de65e19817 Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f

Former-commit-id: cbacc77367 [formerly 1d5bd95866] [formerly cbacc77367 [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]
Former-commit-id: dceb2cde5d
Former-commit-id: c498e21b23 [formerly 29eb436b19]
Former-commit-id: 0b8ecada1b
2012-11-13 15:53:03 -06:00
Lee Venable
c79fb63b54 Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
Former-commit-id: 5b4f3c68f1 [formerly c1e46f52ca] [formerly 5b4f3c68f1 [formerly c1e46f52ca] [formerly 9d149bef29 [formerly 795564ae453a7afb423980679c3719a7c453aa74]]]
Former-commit-id: 9d149bef29
Former-commit-id: 3d07136ccc [formerly 32f088d986]
Former-commit-id: 07c1a3b61b
2012-11-13 15:35:13 -06:00
Lee Venable
26b3fb0059 Merge "Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open." into development
Former-commit-id: 20548994dd [formerly 0c936a3f8c] [formerly 20548994dd [formerly 0c936a3f8c] [formerly d935fff585 [formerly f037a61c9fd0c0d85a7596b95cdd35072f7bafe0]]]
Former-commit-id: d935fff585
Former-commit-id: 69888e4517 [formerly a78cdc9ee4]
Former-commit-id: 92a2578ebf
2012-11-13 15:34:40 -06:00
Roger Ferrel
295c73d59e Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0

Former-commit-id: 6f6b9dd21a [formerly 1e8dfdc857] [formerly 6f6b9dd21a [formerly 1e8dfdc857] [formerly b421a30116 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]
Former-commit-id: b421a30116
Former-commit-id: 1272837397 [formerly d646f32d6e]
Former-commit-id: 3eb1da1b66
2012-11-13 13:20:28 -06:00
Lee Venable
8515ddae22 Merge "Issue #1317 - Fix problem in edexProcessStats.xml" into development
Former-commit-id: 4b8129ea58 [formerly 5fce4fde98] [formerly 4b8129ea58 [formerly 5fce4fde98] [formerly 548973dae0 [formerly bde192a2c922a9bb239d1558794cf03ec6944118]]]
Former-commit-id: 548973dae0
Former-commit-id: 39f2ebaf14 [formerly 89e28445e5]
Former-commit-id: 901e4fa29c
2012-11-13 13:19:00 -06:00
Roger Ferrel
046da0519b Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: e3ae2eb355 [formerly 22f8bc10f0] [formerly e3ae2eb355 [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]
Former-commit-id: 4c3af2a258
Former-commit-id: c1c0e53b2d [formerly 8e85e1c8df]
Former-commit-id: 1b582e49a6
2012-11-13 12:55:33 -06:00
Ron Anderson
6bf06bf78f Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: 1bb7258935 [formerly 8a5a2dc532] [formerly 1bb7258935 [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: d6a33fb39f [formerly bad09a9c0d]
Former-commit-id: dc6b83dccc
2012-11-13 12:06:54 -06:00
Mike Duff
3eee332949 Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03

Former-commit-id: 248db814c1 [formerly 0e32ab85db] [formerly 248db814c1 [formerly 0e32ab85db] [formerly e14b372f42 [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]]
Former-commit-id: e14b372f42
Former-commit-id: b91dca252e [formerly 363aa7bec6]
Former-commit-id: 4771bb25ac
2012-11-13 11:44:02 -06:00
Roger Ferrel
58dc77407c Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.

Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f

Former-commit-id: fdfa0f2030 [formerly 5ce67ffd9e] [formerly fdfa0f2030 [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]
Former-commit-id: ae52206cc7
Former-commit-id: 122a5cf0a4 [formerly 30c70cc181]
Former-commit-id: d31e866744
2012-11-13 09:49:16 -06:00
Nate Jensen
7be1809e99 Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: ca20259c16 [formerly 8a07ba3c11] [formerly ca20259c16 [formerly 8a07ba3c11] [formerly e7045022ad [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]
Former-commit-id: e7045022ad
Former-commit-id: 2be953df6b [formerly 7baf10fc53]
Former-commit-id: b4bfd19895
2012-11-13 09:28:05 -06:00
Ron Anderson
ed9db8384e Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: 8632dfa784 [formerly 024d384292] [formerly 8632dfa784 [formerly 024d384292] [formerly 41f68a9cac [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]]
Former-commit-id: 41f68a9cac
Former-commit-id: a4d6e197be [formerly d07cb8c041]
Former-commit-id: e825e032e1
2012-11-13 09:17:32 -06:00
Nate Jensen
e99e40f886 Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: b43634a58f [formerly c2631b5ba6] [formerly b43634a58f [formerly c2631b5ba6] [formerly ff16f82b18 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]]
Former-commit-id: ff16f82b18
Former-commit-id: 9170b7f75e [formerly 14a139c813]
Former-commit-id: 61beb174fe
2012-11-13 09:01:43 -06:00
Nate Jensen
0f982fbf32 Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: 254e88a70c [formerly 8a1f3a10a4] [formerly 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 14b61ef0f8 [formerly cf8fd9f731]
Former-commit-id: d94afa6a55
2012-11-12 17:16:07 -06:00
Lee Venable
e383520c28 Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: e62c2fb732 [formerly a576274c3c] [formerly e62c2fb732 [formerly a576274c3c] [formerly d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]
Former-commit-id: d4276e6474
Former-commit-id: eaf7e7c724 [formerly fb4b76b003]
Former-commit-id: 85b200a973
2012-11-12 16:58:17 -06:00
Max Schenkelberg
c6b516ff9e Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 30c1802398 [formerly d1099addc6] [formerly 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 4408af827f [formerly c4e5092f94]
Former-commit-id: 9a13824af2
2012-11-12 16:46:21 -06:00
Nate Jensen
7fce83f574 Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02

Former-commit-id: b24c9eb456 [formerly f255f65b3c] [formerly b24c9eb456 [formerly f255f65b3c] [formerly bf72e29752 [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]]
Former-commit-id: bf72e29752
Former-commit-id: cfed9d9664 [formerly 78a1185b19]
Former-commit-id: 5b837a1b13
2012-11-12 16:45:33 -06:00
Roger Ferrel
3bc3bf17fd Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.

Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4

Former-commit-id: ab77dfa758 [formerly 66606f88de] [formerly ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]
Former-commit-id: e982c0f43a
Former-commit-id: 3b07bb1ae6 [formerly de21a3f2ef]
Former-commit-id: d9c7c4ae56
2012-11-12 16:27:08 -06:00
Roger Ferrel
a3608d98fd Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.

Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f

Former-commit-id: 13c0fb3f3d [formerly 6445081aa9] [formerly 13c0fb3f3d [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]
Former-commit-id: 76109f3bf7
Former-commit-id: 01899535e3 [formerly e7cd99ff0d]
Former-commit-id: 3ebaaa8992
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
19f9437de6 Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: 65441372df [formerly 7d3f479031] [formerly 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]
Former-commit-id: b5b472dee1
Former-commit-id: 810e0abd77 [formerly 220f41ec4c]
Former-commit-id: 94d44ed440
2012-11-12 15:15:49 -06:00
Ron Anderson
46bedc0009 Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: 7aaf4db2dc [formerly f709ab812a] [formerly 7aaf4db2dc [formerly f709ab812a] [formerly 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]
Former-commit-id: 303994ff1b
Former-commit-id: 3ae270a65d [formerly 7bf1316e8c]
Former-commit-id: 80a6ade49c
2012-11-12 15:02:08 -06:00
Roger Ferrel
577c2b88ab Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5

Former-commit-id: 6ec9c1fac4 [formerly 9c9a068908] [formerly 6ec9c1fac4 [formerly 9c9a068908] [formerly f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]
Former-commit-id: f48474fc82
Former-commit-id: 398f71471d [formerly b11413b7f0]
Former-commit-id: 6b0c3820d8
2012-11-12 14:22:02 -06:00
Lee Venable
b02aebcfad Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: 72aedbcece [formerly ab62adea95] [formerly 72aedbcece [formerly ab62adea95] [formerly 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]
Former-commit-id: 7db247e33a
Former-commit-id: 6ab3480255 [formerly ded0bfb92f]
Former-commit-id: 92063028bc
2012-11-12 14:13:06 -06:00
Lee Venable
19bf7ac8aa Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: d9022d16a6 [formerly 879078484e] [formerly d9022d16a6 [formerly 879078484e] [formerly 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]
Former-commit-id: 62c42850e8
Former-commit-id: 2b1be166a2 [formerly 4f26da9a9a]
Former-commit-id: 0a39d42de1
2012-11-12 14:09:44 -06:00
Roger Ferrel
d3eda170ed Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d

Former-commit-id: ce6d6e277e [formerly 3676829e8f] [formerly ce6d6e277e [formerly 3676829e8f] [formerly ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]
Former-commit-id: ee323d9c60
Former-commit-id: 88968c54e5 [formerly 73d9e78e92]
Former-commit-id: 4f86b0b521
2012-11-12 13:20:05 -06:00
Matt Nash
4822f87139 Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2

Former-commit-id: 7fa21f5041 [formerly 1480e0abfc] [formerly 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: dcda4b3fa4 [formerly d728ffadd0]
Former-commit-id: 31241c2d94
2012-11-12 12:53:26 -06:00
Roger Ferrel
f5343fae99 Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: 1f509c5a54 [formerly 30ef939e3c] [formerly 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]
Former-commit-id: 438731ca2e
Former-commit-id: 8490814573 [formerly 195d876753]
Former-commit-id: df5b8485c6
2012-11-12 12:00:03 -06:00
Roger Ferrel
e1bf6814d8 Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: b60cbeda7a [formerly d89ce26aeb] [formerly b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]
Former-commit-id: d489a7ef9f
Former-commit-id: ecba7301a1 [formerly e01a4ae243]
Former-commit-id: 26afb7f186
2012-11-12 07:14:15 -06:00
Ben Steffensmeier
923731a717 Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: 894998b95f [formerly adf0fec9a2] [formerly 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]]
Former-commit-id: c4f99aae63
Former-commit-id: 5ee5347fc0 [formerly 87ec259477]
Former-commit-id: e2b7486803
2012-11-09 13:36:49 -06:00
Lee Venable
2542ec20ca Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: 125ac804a7 [formerly 109076cb73] [formerly 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]]
Former-commit-id: dac9544eed
Former-commit-id: ff21b8d604 [formerly a267d9020b]
Former-commit-id: 458133c121
2012-11-08 17:06:54 -06:00
Nate Jensen
f3daf3dfbb Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 5e718ca85b [formerly a92bfa9393] [formerly 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]]
Former-commit-id: cdd6a986e8
Former-commit-id: 38511f0e95 [formerly 5e3c076506]
Former-commit-id: cbd03947da
2012-11-08 14:50:17 -06:00
Dustin Johnson
f9c6566ba7 Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
  Also change the manifest and .classpath for ohd common

Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b

Former-commit-id: db4d728eb7 [formerly 595c421e47] [formerly db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]
Former-commit-id: 2b6e98954e
Former-commit-id: eac5bc8197 [formerly 0806be04dd]
Former-commit-id: 1317e0b3ef
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
2223e6ff64 Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]
Former-commit-id: 693090cb36
Former-commit-id: 7c93db759c [formerly 884c82c4fe]
Former-commit-id: 74d1381180
2012-11-08 14:45:36 -06:00
Richard Peter
19a98b3fad Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: 7f49c5fe04 [formerly db28cc26aa] [formerly 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]
Former-commit-id: 7077a82458
Former-commit-id: fa6141c745 [formerly e1852956e2]
Former-commit-id: 80862cd12e
2012-11-08 14:40:05 -06:00
Ben Steffensmeier
35b855635f Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]
Former-commit-id: fbed67a208
Former-commit-id: d75b59622a [formerly 7c9341a3a6]
Former-commit-id: 40a07f8998
2012-11-08 14:34:55 -06:00
Richard Peter
decf129e94 Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 10138f3ae8 [formerly 7d8dfb9c01] [formerly 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]
Former-commit-id: 675b1666fd
Former-commit-id: e7151070ee [formerly ed90d0aa23]
Former-commit-id: 1ce242e9f0
2012-11-08 13:43:37 -06:00
Richard Peter
04bd114046 Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: 62e5aff255 [formerly 3450ca3cd3] [formerly 62e5aff255 [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 6fce68b90116d30cf090db64032322916276136b]]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: b8ea93cb95 [formerly 4e0c207306]
Former-commit-id: e72818025a
2012-11-08 13:30:27 -06:00
Dustin Johnson
1ac34361b4 Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c

Former-commit-id: 1220f5167e [formerly ddaa681d8a] [formerly 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]
Former-commit-id: 9784b563cf
Former-commit-id: d0867fedef [formerly 9bb53555a9]
Former-commit-id: cd392c40bf
2012-11-08 12:00:15 -06:00
Roger Ferrel
e3b4a7d750 Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: 709798659d [formerly e26b14a84d] [formerly 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]
Former-commit-id: 89617dda68
Former-commit-id: 553344fb3b [formerly 05825bd6f3]
Former-commit-id: f13bedab32
2012-11-08 11:19:51 -06:00
Lee Venable
2f390bd372 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: 6c0bb76679 [formerly be460c956e] [formerly 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]
Former-commit-id: e791e73a30
Former-commit-id: 1e61d4bd08 [formerly 7b5f085643]
Former-commit-id: b3991fa4c9
2012-11-08 11:11:15 -06:00
Nate Jensen
d70b6dd868 Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: e3487942ac [formerly 96cb1ecc7f] [formerly e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]
Former-commit-id: 01072652dc
Former-commit-id: bdbad943ef [formerly 375c864d28]
Former-commit-id: 7430e8dbfe
2012-11-08 11:08:48 -06:00
Lee Venable
4329af5cea Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: c4526c5ba0 [formerly ff5083715b] [formerly c4526c5ba0 [formerly ff5083715b] [formerly c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]
Former-commit-id: c44f90f675
Former-commit-id: 9523ad6085 [formerly 4a22ded443]
Former-commit-id: 3bdfe02fe3
2012-11-08 10:57:45 -06:00
Roger Ferrel
b895611562 Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: 359ee69fa6 [formerly dfb55edb3d] [formerly 359ee69fa6 [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]
Former-commit-id: eae8a68fd5
Former-commit-id: e7aa940f52 [formerly 24a2e79b28]
Former-commit-id: 062109f9a7
2012-11-08 10:54:41 -06:00
Nate Jensen
42dc82c260 Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: ca5db2ec43 [formerly 9038ff4e10] [formerly ca5db2ec43 [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: fca1922f7b [formerly 7da4882cfb]
Former-commit-id: 7d8c983f1e
2012-11-08 10:34:56 -06:00