Bryan Kowal
|
04bcd7e6dc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]
Former-commit-id: 49422aea62
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
38464427d3
|
Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/static/common/cave/etc/bundles/StationPlot.xml
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
nativeLib/ncep_grib2module/.cproject
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
Former-commit-id: c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]
Former-commit-id: feaacd9356
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
4d7a4aefec
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
nativeLib/files.native/files.native.ecl
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.cots.g2clib/.project
nativeLib/rary.cots.g2clib/g2_unpack3.c
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
Former-commit-id: c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]
Former-commit-id: 665911b033
|
2013-10-31 15:23:08 -05:00 |
|
Bryan Kowal
|
ecda7100be
|
Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: e9b76cf185 [formerly be179f2809180da7812a9f4b53b48870b13191ae]
Former-commit-id: c74123f5a8
|
2013-10-31 14:53:27 -05:00 |
|
David Gillingham
|
f404f1560c
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: c4f5cc53bb [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]
Former-commit-id: 6e1cca2966
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a5f970e238
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: fdeff81da2 [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]
Former-commit-id: 3d36cec7be
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
b61ccc1609
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]
Former-commit-id: 38e33092a2
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
b17891ba0e
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]
Former-commit-id: ccf3d5b1e9
|
2013-10-31 12:24:23 -05:00 |
|
Steve Harris
|
7768ee1c36
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Former-commit-id: 855b444073 [formerly ec141b61f8f0558ff18d1d67492a066c837f20b7]
Former-commit-id: 2257eb5ddd
|
2013-10-31 11:58:04 -05:00 |
|
Steve Harris
|
883ad32443
|
13.5.3-3 baseline
Former-commit-id: 1503847a4b [formerly c261e0753eb106a2912314056a1b4903695750c5]
Former-commit-id: baa036cd62
|
2013-10-31 12:52:07 -04:00 |
|
Richard Peter
|
5048d010f5
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: b482eb2b48 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]
Former-commit-id: 3139055873
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
c1bd170f8a
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: 3fc811102e [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]
Former-commit-id: f123fa11f5
|
2013-10-31 09:22:50 -05:00 |
|
Bryan Kowal
|
16e83e3455
|
Re-enable the build of the awips2 rpm.
Former-commit-id: 326144970c [formerly 65ab48743eecfebde890b51a1c74f9a0d68506bf]
Former-commit-id: 40e8a94235
|
2013-10-30 15:24:01 -05:00 |
|
Greg Armendariz
|
0daf07742e
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]
Former-commit-id: f6d98d6317
|
2013-10-30 14:52:16 -05:00 |
|
Steve Harris
|
5aac54b9f9
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 83d2194a5a [formerly 7466036a36f9fc8eafbac605e44e46cfade0f4a4]
Former-commit-id: 0ab03f2796
|
2013-10-30 12:36:53 -05:00 |
|
Steve Harris
|
c6d951b390
|
13.5.3-2 baseline
Former-commit-id: 6d85d944a6 [formerly 53d73b86bbee5d75bc7cb3a69e12ae78ea22f18f]
Former-commit-id: 055783655b
|
2013-10-30 12:53:25 -04:00 |
|
David Gillingham
|
c58160c9a9
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]
Former-commit-id: 297fd6c3d4
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
411b909107
|
Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development
Former-commit-id: 62a5739feb [formerly 05de1d88cdc4841483864a623346ad16b015d395]
Former-commit-id: d92bd5b69a
|
2013-10-30 11:28:58 -05:00 |
|
Bryan Kowal
|
e4e2c8c796
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: b082ea89c5 [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]
Former-commit-id: eb4c27003f
|
2013-10-30 09:23:55 -05:00 |
|
Ben Steffensmeier
|
e15fecc459
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]
Former-commit-id: 5b395f7417
|
2013-10-29 17:35:55 -05:00 |
|
Nate Jensen
|
e024af7e4f
|
Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: c1fb07bc57 [formerly e7d71688c83961922b6089e719226fc631d65e9a]
Former-commit-id: 7a9fa0c5d3
|
2013-10-29 17:11:15 -05:00 |
|
Brad Gonzales
|
433ee7d942
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 057ba113b5 [formerly 36571478911119efe7195d51f6c820d6e745ccee]
Former-commit-id: 011c42b806
|
2013-10-29 17:04:00 -05:00 |
|
Ben Steffensmeier
|
b713ae826d
|
Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: 1ac69169fa [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]
Former-commit-id: e1180db74b
|
2013-10-29 16:47:06 -05:00 |
|
Brad Gonzales
|
ac8136bd82
|
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: 6bc585aaf6 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]
Former-commit-id: f1480cfc62
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
554a9cddf3
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]
Former-commit-id: f3143ba7b4
|
2013-10-29 14:33:53 -05:00 |
|
Nate Jensen
|
8de69e035a
|
Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: f9d9b0a1dc [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]
Former-commit-id: 11a5776652
|
2013-10-29 13:59:00 -05:00 |
|
Mike Duff
|
2d7c38290e
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: 25e4a4741c [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]
Former-commit-id: 6d5f697300
|
2013-10-29 13:49:47 -05:00 |
|
Dave Hladky
|
be351c82ed
|
Issue #2361 Moved to private JAXB
Former-commit-id: 33a0890d31 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]
Former-commit-id: 5b5e1ca293
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
f5b9d3be39
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: 15aed68c02 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]
Former-commit-id: 6cb541d1a1
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
484271d2a1
|
Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: cfd62f8693 [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]
Former-commit-id: bfa5681bfc
|
2013-10-29 12:31:40 -05:00 |
|
Nate Jensen
|
c45f619260
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: 4879c19e0b [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]
Former-commit-id: a5f2414070
|
2013-10-29 12:31:08 -05:00 |
|
Ben Steffensmeier
|
9c62c3bae2
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: 204b47c67d [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]
Former-commit-id: a4174430f7
|
2013-10-29 12:28:07 -05:00 |
|
Dave Hladky
|
1deca13487
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: bcfa7d7a8f [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]
Former-commit-id: 70d2ad2cdc
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
6cdbad069a
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 1b7b6f0134 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]
Former-commit-id: 1d85220363
|
2013-10-29 12:18:55 -05:00 |
|
Richard Peter
|
5f1c6f5625
|
Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 89b992c01c [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]
Former-commit-id: f75b431a40
|
2013-10-29 12:17:14 -05:00 |
|
Richard Peter
|
bfc87a0607
|
Merge "Issue #2267 Refactored SbnSimulator into the sbnSimulator that runs on the wfo boxes and a centralSbnSimulator that runs on the centralRegistry box." into development
Former-commit-id: b6ffed0066 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]
Former-commit-id: fe45d2b7e6
|
2013-10-29 12:15:35 -05:00 |
|
Bryan Kowal
|
203c5d7288
|
Issue #2268 - fix CAVE installation error
Former-commit-id: 5bc115c56c [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]
Former-commit-id: 7772aca092
|
2013-10-29 11:44:48 -05:00 |
|
Ben Steffensmeier
|
59d8afc639
|
Issue #2489 Fix SfcObs NPE.
Former-commit-id: ddf506ceac [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]
Former-commit-id: f9ee49fac5
|
2013-10-29 10:59:36 -05:00 |
|
Steve Harris
|
a103a0e8ac
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]
Former-commit-id: 560b0075cd
|
2013-10-28 15:58:12 -05:00 |
|
Bryan Kowal
|
df575b7be1
|
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]
Former-commit-id: a6d7822698
|
2013-10-28 14:50:28 -05:00 |
|
Steve Harris
|
f04be86698
|
Merge branch 'master_13.5.3' (13.5.3-1) into omaha_13.5.3
Former-commit-id: 972339d60f [formerly 94cbf77eed9914cb3da525dca61ea9e4dfdd16b4]
Former-commit-id: 602f138493
|
2013-10-28 14:39:22 -05:00 |
|
Nate Jensen
|
4cd0b3fed7
|
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: f62f7dc851 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]
Former-commit-id: ac65672cb2
|
2013-10-28 13:27:17 -05:00 |
|
Ben Steffensmeier
|
4e86bb8e5f
|
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 5b439696df [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]
Former-commit-id: 65522e83c9
|
2013-10-28 13:16:23 -05:00 |
|
Ron Anderson
|
dd3ef2844c
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: f2cfc0c686 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]
Former-commit-id: fa5b6dce02
|
2013-10-28 12:59:44 -05:00 |
|
Richard Peter
|
0c3de0a096
|
Merge "Issue #2249 availableTime now always return non-empty list." into omaha_13.5.3
Former-commit-id: dbea005bd7 [formerly 67d7e4e67e0c9e00ca2a7492a1653e3777303a65]
Former-commit-id: a6c98bc229
|
2013-10-28 12:29:58 -05:00 |
|
Richard Peter
|
6dba9925c3
|
Issue #2362: Fix merge issue
Former-commit-id: 51bf66d456 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138]
Former-commit-id: 814b1878b2
|
2013-10-28 12:13:04 -05:00 |
|
Steve Harris
|
933e7395ac
|
14.1.1-5 baseline
Former-commit-id: f4c53b02fa [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]
Former-commit-id: 877776a04c
|
2013-10-28 12:14:27 -04:00 |
|
Ben Steffensmeier
|
0c66089721
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]
Former-commit-id: 27165cea30
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
82dec19b6a
|
14.1.1-4 baseline
Former-commit-id: 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]
Former-commit-id: bd95bb6a4e
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
851f9df229
|
14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 94f24e0d8a
|
2013-10-28 10:46:02 -04:00 |
|