Commit graph

755 commits

Author SHA1 Message Date
Brad Gonzales
f82711fd94 Issue #1448 Added app context checks to ArealQpeGenSrv MpeLightningSrv. Uncommented run_report_alarm call in run_alarm_whfs. Moved internal methods to private in MpeRUCFreezingLevel.
Amend: removed log statments from run_alarm_whfs based on review comments.
       removed tab.

Change-Id: I05cd853814376bfb0ac61e3340210be928a35c57

Former-commit-id: 4c2cf80f5d [formerly 1a3e279226] [formerly 31c48be1c5] [formerly 4c2cf80f5d [formerly 1a3e279226] [formerly 31c48be1c5] [formerly 69eccc1d80 [formerly 31c48be1c5 [formerly 86c094b2d301dbf6ead2d74bc64b3596cf2ef6d8]]]]
Former-commit-id: 69eccc1d80
Former-commit-id: 2a12b30f0f [formerly a90db41abd] [formerly 41d9b99c252bb6fc0475f979c7deaa852283a2e1 [formerly e1e5001736]]
Former-commit-id: 4f409f63fc550ffd5fa95f475d2e7b7069b25520 [formerly 6277097450]
Former-commit-id: 379b354ffc
2013-01-16 15:23:53 -06:00
Richard Peter
1f14cfcd24 Merge "Issue #1420 - More Rules changes. Peer review comments" into 13.2.1_delivery
Former-commit-id: 7dab4209b8 [formerly 6bc65147b3] [formerly f6749331c9] [formerly 7dab4209b8 [formerly 6bc65147b3] [formerly f6749331c9] [formerly 86acbf5470 [formerly f6749331c9 [formerly fc818294ba14c7b957cf6aedae153d3a18b5219b]]]]
Former-commit-id: 86acbf5470
Former-commit-id: 6304173a89 [formerly 15115e1ac0] [formerly 02269f116e2eed587384fe28b971887e3fe440a1 [formerly 8d72673d7a]]
Former-commit-id: 2cb584b08724ddb66993e0045192697c7e9d4275 [formerly a832f46f6b]
Former-commit-id: 8bc07b9c87
2013-01-16 15:08:37 -06:00
Mike Duff
4df4eb96ff Issue #1420 - More Rules changes.
Peer review comments

Change-Id: I3ed89b332764bba2d995a248e361d20c1eec6edf

Former-commit-id: 5210083e95 [formerly 1df1b5a94d] [formerly 2a31447d6d] [formerly 5210083e95 [formerly 1df1b5a94d] [formerly 2a31447d6d] [formerly 8d0a79703f [formerly 2a31447d6d [formerly 84f2d0ed39e11059359558676c988a0bf1e989b9]]]]
Former-commit-id: 8d0a79703f
Former-commit-id: 504dd2f5c0 [formerly 72a70a6eaf] [formerly dd2462fb0ac1bd87f0124290fd6e8c8a6b100b4b [formerly c6924b6920]]
Former-commit-id: 382a13f5867597e79cfaa678c9d023cf243b2daa [formerly 7a750e72e3]
Former-commit-id: fc87600adb
2013-01-16 14:34:55 -06:00
Richard Peter
0e7e6572c6 Merge "Issue #1493 fix grib2 decoder to handle ensembles" into 13.2.1_delivery
Former-commit-id: 5b35bf0fca [formerly 312b786d02] [formerly 276fee1b70] [formerly 5b35bf0fca [formerly 312b786d02] [formerly 276fee1b70] [formerly b98ed1f8e7 [formerly 276fee1b70 [formerly 8b0a1178ecd824a3b7f399a187f5c152025aa58e]]]]
Former-commit-id: b98ed1f8e7
Former-commit-id: 83045e0709 [formerly e4651df11e] [formerly b581b724a411f648bd7af6972b3d10792d2b037c [formerly 6d3159ea80]]
Former-commit-id: 87c28542c273bb86846267b53be8726622534314 [formerly 6f9c3c3074]
Former-commit-id: 97cc1997ec
2013-01-16 12:41:32 -06:00
Dustin Johnson
693e9d93a2 Issue #1487 Use XML to store stats grouping information in the database
Amend:
  Increase length of grouping column to 1024.
  Add deltaScript to convert the grouping column to xml.
  Change regex to replace any pluginName fields with dashes, not just satellite-mcidas.

Change-Id: I0d5081645c5f11909e5778c8e555d5da3cf77e1a

Former-commit-id: 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 0397f990da [formerly c12b46027f] [formerly b627dfc054] [formerly 19d3a14d4f [formerly b627dfc054 [formerly 38ecb1f36dce4717d0ba9066c8cd22116770d34b]]]]
Former-commit-id: 19d3a14d4f
Former-commit-id: 56b47ffbf1 [formerly ecb1d5564a] [formerly a1d7a7e343770b91b36afc9c193dcdcee6b09ef3 [formerly c750e27389]]
Former-commit-id: d950f4621f676478de7a7656c2bccf8b324d5f74 [formerly 19558ae3fa]
Former-commit-id: 4ab214c5d7
2013-01-16 12:21:11 -06:00
Steve Harris
e77b0896ee Merge branch '13.2.1_delivery' into development
Former-commit-id: e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly 483e55bcef [formerly 8c447659ff [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]]
Former-commit-id: 483e55bcef
Former-commit-id: bda3371aef [formerly b8ab464cee] [formerly 1f1108e1b07236a5416fa8b9d145b56652782043 [formerly 2e34a82690]]
Former-commit-id: 8b7928ea064b9023438dda6e63c688f3a7d1c069 [formerly 77662c1de0]
Former-commit-id: f1164c96a7
2013-01-16 12:03:50 -06:00
Ben Steffensmeier
ad5dcb93a9 Issue #1493 fix grib2 decoder to handle ensembles
Former-commit-id: e2f2c05dbf [formerly 02e0433afc] [formerly 7d155653bc] [formerly e2f2c05dbf [formerly 02e0433afc] [formerly 7d155653bc] [formerly 4595797f5f [formerly 7d155653bc [formerly c694df943bb70f2903fe495400061444a67d3357]]]]
Former-commit-id: 4595797f5f
Former-commit-id: 3f92f1fcf2 [formerly e7969ff457] [formerly 1623e264547ed57e5cb9113a18651e8119bf31cb [formerly fb237583e2]]
Former-commit-id: 1c0787414c16c871e5663b706c16e2dcbe4d317f [formerly e8255e320d]
Former-commit-id: 46f252319e
2013-01-15 18:08:19 -06:00
Bryan Kowal
6ec132fb7c Issue #1414 - adding Satellite to the Data Access Framework
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions

Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9

Former-commit-id: 77660c9f5f [formerly a315e4461b] [formerly 4939e96872] [formerly 77660c9f5f [formerly a315e4461b] [formerly 4939e96872] [formerly 789359a779 [formerly 4939e96872 [formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]]
Former-commit-id: 789359a779
Former-commit-id: 83209a66b7 [formerly 03ccca567a] [formerly cc9c31268f1400d39d5c2b01410315020dcc64f3 [formerly 53a280116b]]
Former-commit-id: 814ce607bdf9b22bf2eee0779984c600ff59725b [formerly e443218bfb]
Former-commit-id: f99ad00934
2013-01-15 18:08:17 -06:00
Matt Nash
fd77a7b920 Issue #1491 add Geometry converter and move registry spring instantiation
Change-Id: I7794f41c637b5e29662356d81e172d3484e66a56

Former-commit-id: 3747c8b646 [formerly 5bc585c73c] [formerly 648c027294] [formerly 3747c8b646 [formerly 5bc585c73c] [formerly 648c027294] [formerly b4f48078ca [formerly 648c027294 [formerly 94b52c4d617f15bb0bd8d460eb9c5ab6e1a201e6]]]]
Former-commit-id: b4f48078ca
Former-commit-id: c34bcdc2f9 [formerly 2070cc94b0] [formerly 55f6f25989185344d92fdca6a9a7fca89c6e9aae [formerly 73ab7a756a]]
Former-commit-id: 9951e76c4e6372910443deb77c7a801162e3c85d [formerly 0ca6e02f27]
Former-commit-id: 12b060c8e3
2013-01-15 17:06:28 -06:00
Richard Peter
d7bfb06114 Merge "Issue #1489 Harvester directories not created causing harvester to not start" into 13.2.1_delivery
Former-commit-id: 853f62e60d [formerly e8a4939150] [formerly 09fb2d0919] [formerly 853f62e60d [formerly e8a4939150] [formerly 09fb2d0919] [formerly 0e684515c6 [formerly 09fb2d0919 [formerly 8388122d8273aca20a9c4292035049957a091a69]]]]
Former-commit-id: 0e684515c6
Former-commit-id: c589e52e22 [formerly cb3f43b17a] [formerly dfce9cdbec9337e69a2347d574c754aa6bb72aca [formerly 8258395d58]]
Former-commit-id: b0885f181de22e65e78be230a89fa014fef86e17 [formerly 81bfd386a2]
Former-commit-id: 90d7ef6fc3
2013-01-15 16:11:35 -06:00
Matt Nash
5829f83d0b Issue #1481 slight clean up of radar, make alphanumeric values empty for any products that do not matter
Change-Id: I88847a609e57e8057a480653add74f0c5c5b4934

Former-commit-id: 5d4a74d81d [formerly 3f8cf19d71] [formerly 79e95d787c] [formerly 5d4a74d81d [formerly 3f8cf19d71] [formerly 79e95d787c] [formerly db1dfd3001 [formerly 79e95d787c [formerly 1ac8a6d7320254f4f69160f764c86e8bd4b35d66]]]]
Former-commit-id: db1dfd3001
Former-commit-id: 2c5f244037 [formerly a78f914b92] [formerly f983659ac6680126974420ce303cfcae2e104c80 [formerly 9f8cc4ec5d]]
Former-commit-id: fe89b1d6e6afb4878787ab53cb2e219033c1f3df [formerly 47de98d4d7]
Former-commit-id: 68911edc7f
2013-01-15 16:05:25 -06:00
Nate Jensen
0a813170ee Merge "Issue #1446 improve javadoc" into development
Former-commit-id: 391d892387 [formerly 0831a0252d] [formerly 10f67e664d] [formerly 391d892387 [formerly 0831a0252d] [formerly 10f67e664d] [formerly c78078ee6e [formerly 10f67e664d [formerly 186ecd09bb158d77c63be03b556f6b4a648f4191]]]]
Former-commit-id: c78078ee6e
Former-commit-id: 9572d5ff1c [formerly 34c9aa4a6f] [formerly 93c12836e30608cd717a02c83ce0e520fca7e1c6 [formerly 7cb08e43b8]]
Former-commit-id: 316b4ffa55a2399e86656fbaaab88bff2eea9490 [formerly 0e411bce89]
Former-commit-id: 315a0d1c73
2013-01-15 15:27:44 -06:00
Nate Jensen
1ad8202ec7 Issue #1446 improve javadoc
Change-Id: I5cd77c5d4e5e75f3b0a364db610c470d163b9307

Former-commit-id: ea0b3aebed [formerly 1bd160b878] [formerly 2450821fe7] [formerly ea0b3aebed [formerly 1bd160b878] [formerly 2450821fe7] [formerly 8588d94cd7 [formerly 2450821fe7 [formerly 668baa6b031f79d82aff64d98a13cd901ac90222]]]]
Former-commit-id: 8588d94cd7
Former-commit-id: 0c971c4543 [formerly f342a404c6] [formerly 43b2db9917d10844d8545607870b024c4be661d0 [formerly 3ea6667da1]]
Former-commit-id: eab18a3ed35fc19e7db514ed9cd77048808493d9 [formerly cd4f1a651b]
Former-commit-id: e3643ece32
2013-01-15 15:22:46 -06:00
Bryan Kowal
d9c01fe8a0 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 1414f0415b [formerly fba28ea69b] [formerly e2a12845d3] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 49b121ed3a [formerly 38480e46b1] [formerly 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]]
Former-commit-id: 64fa164a62368e1ef375932fe20cd65b2d0ba6fb [formerly 290167ac16]
Former-commit-id: 89cc2bdf57
2013-01-15 14:56:01 -06:00
Max Schenkelberg
56d05965a7 Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]]
Former-commit-id: db3e7bab99
Former-commit-id: 4e507c57f6 [formerly fac8769336] [formerly 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568]]
Former-commit-id: 8a42c64afd5c2350c96215ef1e4d9f285971a7a1 [formerly 21dae56a1b]
Former-commit-id: be1fb93c1b
2013-01-15 14:41:19 -06:00
Nate Jensen
c1d96a5c67 Issue #1446 Initial python within Jep implementation of data access framework
Change-Id: I7b6ddb25f0ec68419aab7e40f15f94cd16e155b8

Former-commit-id: 744f536415 [formerly e5e7107a56] [formerly e5237fceac] [formerly 744f536415 [formerly e5e7107a56] [formerly e5237fceac] [formerly 12e0a100c4 [formerly e5237fceac [formerly 1c5339c02a8570e12f92559a3159006efdf0df77]]]]
Former-commit-id: 12e0a100c4
Former-commit-id: 65e91312b6 [formerly f726a26b54] [formerly 7bc5f3faca240fbf62ffec334f821eb98bc580ed [formerly aaa442212a]]
Former-commit-id: c66cd235437b4633721e60a0a8ea567a4372d697 [formerly d16264c05b]
Former-commit-id: fcb34cb00f
2013-01-15 13:48:04 -06:00
Dave Hladky
43b0a2d575 Issue #1489 Harvester directories not created causing harvester to not start
Change-Id: Id5caa14ebc33451f95e5d1e9d685c4094091ff63

Former-commit-id: e5b4934da1 [formerly 34577b50dd] [formerly 9b75eaf869] [formerly e5b4934da1 [formerly 34577b50dd] [formerly 9b75eaf869] [formerly b6bf73134e [formerly 9b75eaf869 [formerly 08b944fa708ba12ac6df63b64501ff20f4738063]]]]
Former-commit-id: b6bf73134e
Former-commit-id: e45aff44f4 [formerly fa9dc500a3] [formerly 3db6fe5b5d30defe833550d4242d81c1a27c008e [formerly ccf832dd38]]
Former-commit-id: 4fb19b27ae798879f24fe97c6f8cba41e4fd5645 [formerly d1c940cd8e]
Former-commit-id: 50d1017f46
2013-01-15 12:41:15 -06:00
Dustin Johnson
23e70d529a Issue #1286 Fix bugs found during 1286 testing
Amend:
  Add time domain code.

Change-Id: Ib62ea23571a7e80877f8090064a8638e111fd2d2

Former-commit-id: 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 50fa22f710 [formerly 99f8d40bed] [formerly 3d74a68e94] [formerly 2cf52d976b [formerly 3d74a68e94 [formerly 9b79cfc11541c737087fb613c686d50cf79e0a7b]]]]
Former-commit-id: 2cf52d976b
Former-commit-id: b18fc5ff5e [formerly 94e95f3e07] [formerly d2caf5c394290add805dceb28270a72f9b600765 [formerly aa7acedf0a]]
Former-commit-id: 21ec2413c9d2a86c99721c6504722141f9046ddb [formerly 5cd31fc0b7]
Former-commit-id: 1070de3f2d
2013-01-15 10:18:14 -06:00
Steve Harris
82b5097d74 Issue #1408 - Fix syntax errors in server config
Former-commit-id: 73c5d94310 [formerly 9a3be4460e] [formerly aee6a65e4c] [formerly 73c5d94310 [formerly 9a3be4460e] [formerly aee6a65e4c] [formerly a5eac8ec3c [formerly aee6a65e4c [formerly 29e1fc44a04dff56747b60d904e49d87cebf4f85]]]]
Former-commit-id: a5eac8ec3c
Former-commit-id: eedb2903b1 [formerly e202452ace] [formerly b03470754f36ce50d19e7ef9072478e1b49ef2dd [formerly 31f190865e]]
Former-commit-id: 34f68cca639238d5ffbaad2490418fbb6ef80dee [formerly 72f3894768]
Former-commit-id: 846ac28155
2013-01-15 09:47:25 -06:00
Richard Peter
0a55bcfd67 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
2013-01-14 18:07:17 -06:00
Richard Peter
41573e6a66 Merge "Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development" into development
Former-commit-id: 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4c82ddaa12 [formerly d2cc93281a] [formerly 59368e93e1] [formerly 4176d078a7 [formerly 59368e93e1 [formerly 931d3e1bba7c747737818f5a2a0c8a8ad9a32c47]]]]
Former-commit-id: 4176d078a7
Former-commit-id: dd346fa040 [formerly ea7d2eaff1] [formerly f0175e39c5b471bab4e4eaa25e855a6631e81662 [formerly 2049e40d87]]
Former-commit-id: bdf12ba78e3f28331c93eea472f33745bc6ddaa1 [formerly 57e68e7872]
Former-commit-id: ff672cac47
2013-01-14 17:49:29 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
2013-01-14 17:38:38 -06:00
Richard Peter
252cdf4ed2 Merge "Issue #1477 Permissions broken for ingestDAT SQL querries." into development
Former-commit-id: d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly d7beb14c67 [formerly a8495324f7] [formerly de7d7b07ef] [formerly 9ef997e3e8 [formerly de7d7b07ef [formerly 83ee4be25f2ad1e0a2f30f2695a2a65200abd787]]]]
Former-commit-id: 9ef997e3e8
Former-commit-id: 809c981306 [formerly 997ab69bf0] [formerly acf0de98c326adcb9c362eeee1f6403fbb971811 [formerly 94eea3065b]]
Former-commit-id: b03f2f7ac9211a133637c5710d1b71c02e3b6c48 [formerly bdc637110a]
Former-commit-id: c7f02b18c5
2013-01-14 17:34:31 -06:00
Richard Peter
cccc6f7918 Merge "Issue #1482 ignore malformed gribModel files" into development
Former-commit-id: 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 85519760d6 [formerly 5ec69e843e] [formerly 89b08fdd2f] [formerly 8192515b06 [formerly 89b08fdd2f [formerly fd8bd261b089b317e4ce66ca0e0aa6d5861a1b09]]]]
Former-commit-id: 8192515b06
Former-commit-id: c056fd25cb [formerly 9154383e5a] [formerly e1968aa07abf36dd7677eb698b3949b4d6ce48c3 [formerly 0b57b16cda]]
Former-commit-id: c079d32f41e54072fc4ab430c0fe1b6e348e1723 [formerly a1517b8daa]
Former-commit-id: ad6bd4ace8
2013-01-14 17:34:17 -06:00
Richard Peter
97c1ff58a1 Issue #1408: Merge branch 'ss_builds' (13.1.2-6) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/res/spring/viz.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/auth/UserController.java
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/OrLevelNode.java
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogMonitorAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeSeasAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.uf.viz.plugin.nwsauth/src/com/raytheon/uf/viz/plugin/nwsauth/NwsUserManager.java
	cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/StatsControlDlg.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridProductBrowserDataDefinition.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/ImportLevelNode.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/CoverageUtils.java
	cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/HydroDisplayManager.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.ui/src/com/raytheon/viz/ui/dialogs/AwipsCalendar.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
	cave/ohd.hseb.common/externaljars/jdom.jar
	cots/org.geotools/.classpath
	cots/org.geotools/META-INF/MANIFEST.MF
	cots/org.geotools/build.properties
	edexOsgi/build.edex/build.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/bin/setup.env
	edexOsgi/build.edex/esb/bin/wrapper.conf
	edexOsgi/build.edex/esb/conf/log4j-registry.xml
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/build.edex/esb/conf/spring/cron.properties
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/build.edex/esb/etc/registry.sh
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
	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/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyMessage.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/notify/GribNotifyQueue.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/topo/StaticDataGenerator.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribParamInfoLookup.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/alias/grib.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/grids/grid104.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_FSL-59.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NOAA-161.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NWSTG-8.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RFC-9.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_RSMC-54.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/ecmwf.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpc_qpf218.xml
	edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/DataFactoryRegistry.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/grid/IGridData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/mapping/DatasetIdMapper.java
	edexOsgi/com.raytheon.uf.common.dataplugin.level/src/com/raytheon/uf/common/dataplugin/level/mapping/LevelMapper.java
	edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/subgrid/SubGrid.java
	edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/FileLocker.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/lookup/ParameterLookup.java
	edexOsgi/com.raytheon.uf.common.parameter/src/com/raytheon/uf/common/parameter/mapping/ParameterMapper.java
	edexOsgi/com.raytheon.uf.common.parameter/utility/common_static/base/parameter/definition/parameters.xml
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/RoleXML.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
	edexOsgi/com.raytheon.uf.common.util/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/ConvertUtil.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/AliasNamespace.java
	edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/mapping/Mapper.java
	edexOsgi/com.raytheon.uf.edex.auth/src/com/raytheon/uf/edex/auth/RemoteServerRequestRouter.java
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	edexOsgi/com.raytheon.uf.edex.event/src/com/raytheon/uf/edex/event/EventBus.java
	edexOsgi/com.raytheon.uf.edex.gridcoverage/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.gridcoverage/res/spring/gridcoverage-common.xml
	edexOsgi/com.raytheon.uf.edex.gridcoverage/src/com/raytheon/uf/edex/gridcoverage/GetGridCoverageHandler.java
	edexOsgi/com.raytheon.uf.edex.ohd/resources/com.raytheon.uf.edex.ohd.properties
	edexOsgi/com.raytheon.uf.edex.plugin.grid/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridInfoCache.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/res/spring/nwsauth-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/handler/GraphDataHandler.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	pythonPackages/pypies/pypies/impl/H5pyDataStore.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I80504ec890827bb512be138f319380d04bdfc402

Former-commit-id: 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 9cad9f0c54 [formerly 1a1a69d38c] [formerly 970216e4c9] [formerly 19d923f387 [formerly 970216e4c9 [formerly ad841de833a274ad0d5b48b63dbd7dbefb728117]]]]
Former-commit-id: 19d923f387
Former-commit-id: 7af4fc10a8 [formerly f1262388ce] [formerly 8835cc0deb6ecb25ed3f4f23af4a1a62f0414be7 [formerly 8ccc791566]]
Former-commit-id: 1fd01bf080c7430697622a86c36545061e29af0c [formerly 2575e4e4ea]
Former-commit-id: e59ea72456
2013-01-14 16:53:05 -06:00
Ben Steffensmeier
2d845671d7 Issue #1482 ignore malformed gribModel files
Former-commit-id: beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly beda2be0cb [formerly fadf4d58cf] [formerly 685c09de47] [formerly 9cfa09e507 [formerly 685c09de47 [formerly 272da22e4ce82215aa4b00ce7624811f81327889]]]]
Former-commit-id: 9cfa09e507
Former-commit-id: b2029cc48a [formerly 80e307c96e] [formerly 68d3db82e2a055144685ccadce3c90ec541556fb [formerly 8fdfc14c29]]
Former-commit-id: f3128381541f4e049435ad97f2894e64711267b2 [formerly cc70fe7a41]
Former-commit-id: e65ba73968
2013-01-14 15:10:56 -06:00
Dave Hladky
073f3c8bcf Issue #1477 Permissions broken for ingestDAT SQL querries.
Change-Id: If39e30852e98e85f9309df9e0d03ce0c13c8f94b

Former-commit-id: e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly e3ec930c36 [formerly 65cfb39ba5] [formerly 30733d3b25] [formerly c9160ac945 [formerly 30733d3b25 [formerly 7226d6c64aa5e02c0bfebe530cc2ce578fba787e]]]]
Former-commit-id: c9160ac945
Former-commit-id: bd45e9af0f [formerly e746688671] [formerly ecd233941bfc185849d394ea786bc19f15301274 [formerly c5f71be70a]]
Former-commit-id: 969e08441cecb98cce422486ce46b9039e08656b [formerly 936d0f143d]
Former-commit-id: 64c293c460
2013-01-14 11:38:45 -06:00
Steve Harris
32c48861de 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
2013-01-11 16:19:07 -05:00
Steve Harris
005d9ccae2 13.1.2-7 baseline
Former-commit-id: 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 0b15dff12b [formerly a8d90da9c0] [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]]
Former-commit-id: 42189b5f88
Former-commit-id: 4c8e604619 [formerly f1256f2a9e] [formerly 14e868b80bdcdb7270336e9346e3a2f321283073 [formerly b7f1dbe72b]]
Former-commit-id: bc0b5a7bf290d46a49a6251bcf649c05a7b9d563 [formerly 775a338b90]
Former-commit-id: 1ef10eaf2c
2013-01-11 16:12:09 -05:00
Richard Peter
33bbd393bd Merge "Issue #1412 Move useradmin plugins out of datadelivery specific feature" into development
Former-commit-id: 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 0c51e2e3aa [formerly 71d8907b6e] [formerly 8df96c2a14] [formerly 2cb7e1fe2c [formerly 8df96c2a14 [formerly f65462361c68b9757493f673463c731d0ded9dba]]]]
Former-commit-id: 2cb7e1fe2c
Former-commit-id: cf8483486b [formerly 74092ae046] [formerly bae6162eee72ec419f36031f9ab9e5c6edea709d [formerly 90ec121020]]
Former-commit-id: 85903a4d7fd36b124d852701aa63c2f9da2782b5 [formerly da60306633]
Former-commit-id: d72901c86c
2013-01-11 12:53:37 -06:00
Dustin Johnson
80af42fd9e Issue #1412 Move useradmin plugins out of datadelivery specific feature
Change-Id: Ide1f64a373d2d65b02fb92afd8e8b484cc620451

Former-commit-id: 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly 32047140e1 [formerly 08911772bf] [formerly 7d10c7fac5] [formerly f44a2f6ea9 [formerly 7d10c7fac5 [formerly b4908a75e84a6df2ed97e517ac096a7d6693ba2e]]]]
Former-commit-id: f44a2f6ea9
Former-commit-id: bce1b88d26 [formerly 5e4a1b7bd9] [formerly 1f7651d3448a20469f46b569fcc7d279b6bb1842 [formerly bd8dbc39e7]]
Former-commit-id: f255756970b2d5c0475ee469843208550ee7f07c [formerly 69c42d3e72]
Former-commit-id: b462fe0286
2013-01-11 12:39:00 -06:00
Richard Peter
038b214887 Merge "Issue #1453 Fix handling of active period across year boundary" into development
Former-commit-id: dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly dc6c7afd42 [formerly 58242a600c] [formerly 32e5d79e7a] [formerly a2c3db2ee7 [formerly 32e5d79e7a [formerly 5b08568c4f07da6d5916025e076260b0f469a68c]]]]
Former-commit-id: a2c3db2ee7
Former-commit-id: dd12b3fe0f [formerly cf815a4c72] [formerly 0dc63b9bd4f59e8fed895f177efe7f6278747845 [formerly d3df89181f]]
Former-commit-id: 505df6e18a00aa3547de015d6cffa6c770479c9f [formerly a9f01d5846]
Former-commit-id: 87b4521a69
2013-01-11 12:37:05 -06:00
Dustin Johnson
f275418843 Issue #1453 Fix handling of active period across year boundary
Change-Id: I6bd5f075d74d394eab2a47a2b5fee3e2d91fd272

Former-commit-id: f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly f7fa425488 [formerly 3e1878c5f9] [formerly 7716f1baa9] [formerly c4068d27bf [formerly 7716f1baa9 [formerly eb1c45cff6c9b0a6b5d194e8f5b9b582646ebde2]]]]
Former-commit-id: c4068d27bf
Former-commit-id: 2a306b4122 [formerly a4414d409a] [formerly c86a35d61a0a7c32f9505c7606fcb5598beded97 [formerly 0b3f803f6c]]
Former-commit-id: 3330a60d2df34bd1b8732593f276c83b6d1c1c02 [formerly 9b3cf3308f]
Former-commit-id: ef31fc45a9
2013-01-11 12:23:15 -06:00
Dave Hladky
87ae3ccfb8 Issue #1466 Updated parsing for NCOM, revamped MetaDataParser to make more efficient, unit updates, tests, params
Change-Id: I5177209c25cb08c0ffe74104ceb6e16874ce3208

Former-commit-id: b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly b56b5c1fe8 [formerly 440de708df] [formerly 5cf3eee426] [formerly 002ac2eb41 [formerly 5cf3eee426 [formerly 9b8169d2523480750bb3cf557fb8902a9cafcc03]]]]
Former-commit-id: 002ac2eb41
Former-commit-id: 59c349ac77 [formerly fe486b4889] [formerly 6a98f7fe2876ba19787aa908c721669aaf618444 [formerly 5312e82b4b]]
Former-commit-id: 57ac28b8518a3193cbd3b4125cd190f547bac07f [formerly a51f8f449b]
Former-commit-id: b5ea7aaff8
2013-01-11 11:59:36 -06:00
Dustin Johnson
2598fc06d8 Issue #1441 Cleaned up editing/deleting groups and handling of user permissions
Amend:
  Split creation and edit group dialogs.
  Add some javadoc and remove sysouts.
  Add missing test data causing broken tests.
  Rebased.

Change-Id: I00d48f2a97bf8398b74bf8ed568cb19126d2c185

Former-commit-id: b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly b128ed3340 [formerly 8473eb60fb] [formerly 4ae1a9645c] [formerly 446f65776e [formerly 4ae1a9645c [formerly 797f570e28086b43b5d851275fba457c5920f57e]]]]
Former-commit-id: 446f65776e
Former-commit-id: 6984791be8 [formerly 7bf029eb7e] [formerly 23c340a1e9db08699dd6472e0937d44ae0e67cc5 [formerly 64ececeda1]]
Former-commit-id: 4b7dc8fbd66d90306e884b8ea9c8af6f53371156 [formerly 6fb6bc8f87]
Former-commit-id: f269969791
2013-01-11 11:53:02 -06:00
Richard Peter
cda4eef641 Issue #1472: Fix GFE queryByD2DParmId to include required level in query
Change-Id: I3bedb92ce79dbf5fca3f96293b7474011d701751

Former-commit-id: 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 169e239175 [formerly f9e89ee518] [formerly d36faee34e] [formerly 8d1cc52ba7 [formerly d36faee34e [formerly d7835ba3e0d450f10b8ad191b5ebd7c6df4654c8]]]]
Former-commit-id: 8d1cc52ba7
Former-commit-id: c889337379 [formerly e23ffee8bd] [formerly 3ffa5df29311f58109b1f282d144e85b5751c9af [formerly 7e4a0f1377]]
Former-commit-id: 2953ad3d7fd0d19919b0dda10049c53590a3862c [formerly f7b8b095cc]
Former-commit-id: 8286fb0351
2013-01-11 11:03:42 -06:00
Dustin Johnson
4aa6e6fb69 Issue #1412 Add common useradmin code to PDE build for EDEX
Change-Id: I5d676ff43dbe89c2e6a2f48e373704cbf38e42bc

Former-commit-id: 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly 61764bac16 [formerly 6cc28be958] [formerly ede32c8d3e] [formerly f316320b06 [formerly ede32c8d3e [formerly 39d60f23ea246e17924c78562c45cc0b6491a53d]]]]
Former-commit-id: f316320b06
Former-commit-id: 25a4e68f25 [formerly f274ce63e9] [formerly b6ddfc6f49195136d5d7d440c3e182fdd9538e9b [formerly 35409872a6]]
Former-commit-id: 21dac9178560e3afc5725c50138e5a9f1bef619c [formerly adc46ddeef]
Former-commit-id: 9f2c0db712
2013-01-11 08:56:39 -06:00
Richard Peter
d842cfe57e Issue #1454: Update Dataset size calculation
Change-Id: I5653bc1614945fb0dad2eec757e1de0831b809d5

Former-commit-id: 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 9405cb94ae [formerly 45e6e286bb] [formerly deca70207d] [formerly 73263e270e [formerly deca70207d [formerly 345344ed47305bc0698eec29cbae7e7922378cc7]]]]
Former-commit-id: 73263e270e
Former-commit-id: 9d0c8ff714 [formerly 4a097586f6] [formerly 9f6c7c2bc9e428381b9ce3bd65c4d503ebf7348a [formerly 69818573a6]]
Former-commit-id: 033eff671dc64886d6f95f0a1a920fd9a98bc449 [formerly 49da28ead4]
Former-commit-id: 4552b5f71a
2013-01-10 17:17:58 -06:00
Richard Peter
0efa0a7461 Merge "Issue #1420 - Rules Peer review comments" into development
Former-commit-id: 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly 48355758a8 [formerly 206ffc0e15] [formerly 507a3d641c] [formerly c0e712f682 [formerly 507a3d641c [formerly eded38dc13847cc764bcc4cb71997b8abb685c89]]]]
Former-commit-id: c0e712f682
Former-commit-id: d3c6e55c17 [formerly 9524f5a52b] [formerly 97734a3cd0f5afa0b7002ff04016137bde675235 [formerly 9543d23d23]]
Former-commit-id: 87ffeb3ac45703ad2f69f430f100670c9c2a1380 [formerly 6dbbf56c1d]
Former-commit-id: c8c4f68603
2013-01-10 10:51:28 -06:00
Richard Peter
81dfb3f961 Merge "Issue #1412 User Admin dialog should refresh with changes made to authentication data" into development
Former-commit-id: b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly b91a1d35c9 [formerly e1547982b0] [formerly ee6513bad3] [formerly 2d1a6c4833 [formerly ee6513bad3 [formerly 5f26573ba4c0881e1ee6c7a4809f9465589164a1]]]]
Former-commit-id: 2d1a6c4833
Former-commit-id: a4491237e5 [formerly 27a06e14b8] [formerly 6a4957abee715c7f29e3637d9ceac8248e81d07d [formerly 46faa0f68d]]
Former-commit-id: b288c623ea0a30a1e7f08150ba10db89ed72d914 [formerly 58a28b4193]
Former-commit-id: a9a245dfe2
2013-01-10 10:18:39 -06:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
2013-01-09 17:55:05 -06:00
Dustin Johnson
834a16e4bc Issue #1412 User Admin dialog should refresh with changes made to authentication data
Change-Id: I407dc061a50bf30cb2b37a5fa3b1fe8c5e63ce23

Former-commit-id: 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly 4ec1b32d09 [formerly bad7b754e5] [formerly b7ed75896b] [formerly a354bac4da [formerly b7ed75896b [formerly 5e89b4f6c1cbb9db68b5ac185ba09ca5a6543e3b]]]]
Former-commit-id: a354bac4da
Former-commit-id: a010315743 [formerly 424a70dbfe] [formerly 53baf13d05630029a4556dcb8562eff91b689c93 [formerly 0d5bb5ba95]]
Former-commit-id: f99fcc7f473dbe7b10a2d765f054c5b16bffbc0b [formerly 09a33ab8ac]
Former-commit-id: d4d1a95461
2013-01-09 15:40:36 -06:00
Mike Duff
9adac72fba Issue #1420 - Rules Peer review comments
Former-commit-id: 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 86e3e4c397 [formerly f41d525fa3] [formerly 4c63333a96] [formerly 6e0367cdc7 [formerly 4c63333a96 [formerly 9f6756325c5788dd1b98d8f24ab3437993da7dcd]]]]
Former-commit-id: 6e0367cdc7
Former-commit-id: 65dd6c6f60 [formerly ed95eae2e3] [formerly 4e7421c22c8ae6fb0dd6d1566ea3fb164aec7691 [formerly 67486aa43b]]
Former-commit-id: 2661145adf236b4fa5c186262fb5752eabdf600d [formerly 8313877a3a]
Former-commit-id: 660064ea6a
2013-01-09 12:02:21 -06:00
Richard Peter
6f17dfc575 Merge "Issue #1438 do not log grib ingest" into development
Former-commit-id: b617071350 [formerly fe14e7eeba] [formerly 3386fee25a] [formerly b617071350 [formerly fe14e7eeba] [formerly 3386fee25a] [formerly 6e54eea341 [formerly 3386fee25a [formerly f63acd39e8a303be5725c6a1c5e5a6fa0b942c05]]]]
Former-commit-id: 6e54eea341
Former-commit-id: c4d34cf9fd [formerly 54bce1bbd0] [formerly bb9fcd548a99b6a6a22f60f2eebab158ed1e3ed6 [formerly a840a6bed4]]
Former-commit-id: 3837d44acf764c4ed5634c7f5a5c570ca2b92b96 [formerly ff7d27a295]
Former-commit-id: 300868ac56
2013-01-08 16:47:24 -06:00
Richard Peter
daeb4e5bf1 Merge "Issue #1453 Fix the handling of subscription active period dates." into development
Former-commit-id: f7f6455a5f [formerly dc57c5a282] [formerly fd4d8f2407] [formerly f7f6455a5f [formerly dc57c5a282] [formerly fd4d8f2407] [formerly dcbda78944 [formerly fd4d8f2407 [formerly f8edc8238c8e2e115cd776b294c66e572bf00cc6]]]]
Former-commit-id: dcbda78944
Former-commit-id: f8bd67a319 [formerly fdc4ebb5b5] [formerly e91d2bffa583b9662d3ae106dbf61734a2b2712c [formerly 605c8dfe77]]
Former-commit-id: e040a7d0f6d7ece55d794efe2b4b52dae1d9b957 [formerly 13ff9f1cb1]
Former-commit-id: d9f19bfc7b
2013-01-08 16:44:56 -06:00
Ben Steffensmeier
0f88d60923 Issue #1438 do not log grib ingest
Former-commit-id: c0a6c84eca [formerly b7b5f2e22f] [formerly 1c5f61bf33] [formerly c0a6c84eca [formerly b7b5f2e22f] [formerly 1c5f61bf33] [formerly 36ce3e2df9 [formerly 1c5f61bf33 [formerly f2c0fb9ec75271d5c277e8c93da3848a455518fb]]]]
Former-commit-id: 36ce3e2df9
Former-commit-id: 37f8b86337 [formerly cc9922a697] [formerly 7d99bb56744c193cb977c56ebe1f2f6513612a2b [formerly 0c675d3deb]]
Former-commit-id: bfad40c416d8a77897756b3c0a490d5109fe3987 [formerly 6b8ee10c24]
Former-commit-id: 30a076a1b7
2013-01-08 15:50:47 -06:00
Ben Steffensmeier
820f10df05 Issue #1438 change string null to be converted to null always.
Change-Id: I4dfdc681f339c1f7552aae27113f1cbe6e5584e7

Former-commit-id: e7c7bfc0ce [formerly d5c6061ffc] [formerly 0659a127ff] [formerly e7c7bfc0ce [formerly d5c6061ffc] [formerly 0659a127ff] [formerly 8421469229 [formerly 0659a127ff [formerly 12de9bf8bab68ee225a7b31d02c556ad3605aad6]]]]
Former-commit-id: 8421469229
Former-commit-id: f5bf7a99ca [formerly b911356a64] [formerly f081408de0ecbf94f84671da04ad9b4ca0cf554d [formerly 79474382d2]]
Former-commit-id: b574171513eda4852e7cc07abd331f5db4de82d7 [formerly a99267dd11]
Former-commit-id: 01d205d179
2013-01-08 12:56:46 -06:00
Dustin Johnson
683542813d Issue #1453 Fix the handling of subscription active period dates.
Amend:
  Move tests project over that was missed while moving datadelivery code

Change-Id: I10611f8a4b6c2efe6af1813e5181fadc059e4f9a

Former-commit-id: 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 3fb35985d0 [formerly 1975cd0442] [formerly 6a90779214] [formerly 2635e05723 [formerly 6a90779214 [formerly 0e1397db6ca1a7a577d20507bc2c4daf823188fe]]]]
Former-commit-id: 2635e05723
Former-commit-id: 71e085b940 [formerly 885f315d30] [formerly db9b8d2b230d04c2984037f6535517c2201db20b [formerly 492cee4992]]
Former-commit-id: 7294d4c01e6fcf76d993e5993a213ccedb5d6fe1 [formerly b1c159fc7f]
Former-commit-id: b24ddaeb4e
2013-01-08 12:44:29 -06:00
Ron Anderson
c255d85b0e Merge "Issue #1438 fix problems reading a non existent grid alias file." into development
Former-commit-id: 83d9acb900 [formerly dc156f69c4] [formerly 61700b2f37] [formerly 83d9acb900 [formerly dc156f69c4] [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 61700b2f37 [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 5f11995f9d [formerly 0a585a9498] [formerly d81ed4a74678d47e525c1ce217f742e7d4727a6d [formerly 5e9f24b527]]
Former-commit-id: 02421e4bf111bb1ceb47e5209c0dd6335520139c [formerly 693548c7d2]
Former-commit-id: deeb9ab71b
2013-01-08 10:36:19 -06:00