Bryan Kowal
|
d53ec9c750
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: 04bcd7e6dc [formerly 49422aea62] [formerly d08a652e23 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]
Former-commit-id: d08a652e23
Former-commit-id: adb62df96a
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
f02d4b7a0b
|
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: 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
7a83214b1c
|
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: 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]
Former-commit-id: c76c856340
Former-commit-id: 0954490a5a
|
2013-10-31 15:23:08 -05:00 |
|
Bryan Kowal
|
02cdbe0173
|
Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: ecda7100be [formerly c74123f5a8] [formerly e9b76cf185 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]
Former-commit-id: e9b76cf185
Former-commit-id: d08a1af457
|
2013-10-31 14:53:27 -05:00 |
|
Ron Anderson
|
2f23072e41
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: b61ccc1609 [formerly 38e33092a2] [formerly 42e924e021 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]
Former-commit-id: 42e924e021
Former-commit-id: eef9d2dfb0
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
c9d9070600
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: b17891ba0e [formerly ccf3d5b1e9] [formerly de50a9214b [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]
Former-commit-id: de50a9214b
Former-commit-id: d6fcc98e76
|
2013-10-31 12:24:23 -05:00 |
|
Richard Peter
|
fca3d73aa7
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 5048d010f5 [formerly 3139055873] [formerly b482eb2b48 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]
Former-commit-id: b482eb2b48
Former-commit-id: 73462fa134
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
b0c54d7c17
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: c1bd170f8a [formerly f123fa11f5] [formerly 3fc811102e [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]
Former-commit-id: 3fc811102e
Former-commit-id: 4da0648461
|
2013-10-31 09:22:50 -05:00 |
|
Greg Armendariz
|
5cf091c499
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 0daf07742e [formerly f6d98d6317] [formerly 64dd62005b [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]
Former-commit-id: 64dd62005b
Former-commit-id: 4fb0e0bd2f
|
2013-10-30 14:52:16 -05:00 |
|
David Gillingham
|
68b0b2e3db
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: c58160c9a9 [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 996817f124
|
2013-10-30 11:34:46 -05:00 |
|
Nate Jensen
|
90d99fe627
|
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: 411b909107 [formerly d92bd5b69a] [formerly 62a5739feb [formerly 05de1d88cdc4841483864a623346ad16b015d395]]
Former-commit-id: 62a5739feb
Former-commit-id: 5c4d8b4310
|
2013-10-30 11:28:58 -05:00 |
|
Bryan Kowal
|
63324cda6a
|
Issue #2297 - cleanup rpm directory structure; removing files that are no longer needed
Former-commit-id: e4e2c8c796 [formerly eb4c27003f] [formerly b082ea89c5 [formerly d6c5bd5476a039058d5251f4457119fb10806b2e]]
Former-commit-id: b082ea89c5
Former-commit-id: 428dd993d9
|
2013-10-30 09:23:55 -05:00 |
|
Ben Steffensmeier
|
78efdb7572
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: e15fecc459 [formerly 5b395f7417] [formerly 27a392f90e [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]
Former-commit-id: 27a392f90e
Former-commit-id: 418c259567
|
2013-10-29 17:35:55 -05:00 |
|
Nate Jensen
|
e7b26af054
|
Merge "Issue #2267 Removed java.nio.file dependencies from FilenameFilter." into development
Former-commit-id: e024af7e4f [formerly 7a9fa0c5d3] [formerly c1fb07bc57 [formerly e7d71688c83961922b6089e719226fc631d65e9a]]
Former-commit-id: c1fb07bc57
Former-commit-id: 893e91d386
|
2013-10-29 17:11:15 -05:00 |
|
Brad Gonzales
|
3c0bd6db16
|
Issue #2267 Removed java.nio.file dependencies from FilenameFilter.
Change-Id: I6af1cafe17609a6468a7805ccab61b28ecc0a733
Former-commit-id: 433ee7d942 [formerly 011c42b806] [formerly 057ba113b5 [formerly 36571478911119efe7195d51f6c820d6e745ccee]]
Former-commit-id: 057ba113b5
Former-commit-id: 9325d477a9
|
2013-10-29 17:04:00 -05:00 |
|
Ben Steffensmeier
|
fe29ef1c58
|
Issue #2491 Clean resource datas out of ncep plugins.
Former-commit-id: b713ae826d [formerly e1180db74b] [formerly 1ac69169fa [formerly e1259eb7fa31d3142ca9ce43bf46c52f00fb098e]]
Former-commit-id: 1ac69169fa
Former-commit-id: e1054d923c
|
2013-10-29 16:47:06 -05:00 |
|
Brad Gonzales
|
47690ea8d0
|
Issue #2267 Remove java.nio.file dependencies from the SbnSimulator. Fixed handler setting for UFStatus in test env.
Change-Id: I8245eef53573b6596546e17a7900a1538455cee2
Former-commit-id: ac8136bd82 [formerly f1480cfc62] [formerly 6bc585aaf6 [formerly 6b8ff162be029543c8b9a7fcb3f8a359962aa6d7]]
Former-commit-id: 6bc585aaf6
Former-commit-id: aeccaa2329
|
2013-10-29 15:10:20 -05:00 |
|
Nate Jensen
|
19043faeaa
|
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: 554a9cddf3 [formerly f3143ba7b4] [formerly 6880a18f1a [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]
Former-commit-id: 6880a18f1a
Former-commit-id: f2751f017e
|
2013-10-29 14:33:53 -05:00 |
|
Nate Jensen
|
9fee5aedc7
|
Merge "Issue #2361 Moved to private JAXB" into development
Former-commit-id: 8de69e035a [formerly 11a5776652] [formerly f9d9b0a1dc [formerly c55568de340105c89b118ff3f719c7816dcb5e3b]]
Former-commit-id: f9d9b0a1dc
Former-commit-id: 35209c8a5d
|
2013-10-29 13:59:00 -05:00 |
|
Mike Duff
|
4beb79d5a7
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: 2d7c38290e [formerly 6d5f697300] [formerly 25e4a4741c [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]
Former-commit-id: 25e4a4741c
Former-commit-id: 73ecb9af6b
|
2013-10-29 13:49:47 -05:00 |
|
Dave Hladky
|
3eff51897b
|
Issue #2361 Moved to private JAXB
Former-commit-id: be351c82ed [formerly 5b5e1ca293] [formerly 33a0890d31 [formerly facfc8287c3826ca9764b7be336cc332b5567a94]]
Former-commit-id: 33a0890d31
Former-commit-id: b55b05fa8b
|
2013-10-29 13:45:05 -05:00 |
|
Dave Hladky
|
b5e309f973
|
Issue #2361 Centralized serialization to the HarvesterConfigurationManager.
Former-commit-id: f5b9d3be39 [formerly 6cb541d1a1] [formerly 15aed68c02 [formerly ded6bbf39f6d6fe05f31d61f310e7473d55a6643]]
Former-commit-id: 15aed68c02
Former-commit-id: a8ab9072cc
|
2013-10-29 13:05:47 -05:00 |
|
Nate Jensen
|
afe952cce9
|
Merge "Issue #2491 Move ncep bundles off od SerializationUtil." into development
Former-commit-id: 484271d2a1 [formerly bfa5681bfc] [formerly cfd62f8693 [formerly 08f8e4274f547455e6a9fc09a3ab025a68f097a7]]
Former-commit-id: cfd62f8693
Former-commit-id: 84deb7d911
|
2013-10-29 12:31:40 -05:00 |
|
Nate Jensen
|
96c901b958
|
Merge "Issue #2361 Harvester JAXB fixed up" into development
Former-commit-id: c45f619260 [formerly a5f2414070] [formerly 4879c19e0b [formerly 2421a960399e6deeb911cf25f968e6eead666bd6]]
Former-commit-id: 4879c19e0b
Former-commit-id: 4929a59b3e
|
2013-10-29 12:31:08 -05:00 |
|
Ben Steffensmeier
|
09347cdd5a
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: 9c62c3bae2 [formerly a4174430f7] [formerly 204b47c67d [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]
Former-commit-id: 204b47c67d
Former-commit-id: 9540b309b3
|
2013-10-29 12:28:07 -05:00 |
|
Dave Hladky
|
1a889e84b1
|
Issue #2361 Harvester JAXB fixed up
Former-commit-id: 1deca13487 [formerly 70d2ad2cdc] [formerly bcfa7d7a8f [formerly 6d9af3f0f470cfe5a566789c59a90fe05e516aa2]]
Former-commit-id: bcfa7d7a8f
Former-commit-id: c5137923c0
|
2013-10-29 12:20:53 -05:00 |
|
Richard Peter
|
4b612a3fa0
|
Merge "Issue #2469 Refined deletion of adhoc subs." into development
Former-commit-id: 6cdbad069a [formerly 1d85220363] [formerly 1b7b6f0134 [formerly 2ff6d9a5e793e7673ddf8d5e5c5b25cf3235e12e]]
Former-commit-id: 1b7b6f0134
Former-commit-id: c27c764c61
|
2013-10-29 12:18:55 -05:00 |
|
Richard Peter
|
66d7ccb859
|
Merge "Issue #2385 Fixed subscription backup web service. Restored subscriptions are now scheduled in the bandwidth manager" into development
Former-commit-id: 5f1c6f5625 [formerly f75b431a40] [formerly 89b992c01c [formerly 5b492459c0156a49eb12dea54a38ecec532fb58d]]
Former-commit-id: 89b992c01c
Former-commit-id: c56806b9b7
|
2013-10-29 12:17:14 -05:00 |
|
Richard Peter
|
5baa99e9c9
|
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: bfc87a0607 [formerly fe45d2b7e6] [formerly b6ffed0066 [formerly ef99656b07406288bf419037b05e85a5cf5771d6]]
Former-commit-id: b6ffed0066
Former-commit-id: 4765eaefad
|
2013-10-29 12:15:35 -05:00 |
|
Bryan Kowal
|
a89499f399
|
Issue #2268 - fix CAVE installation error
Former-commit-id: 203c5d7288 [formerly 7772aca092] [formerly 5bc115c56c [formerly b36df9f89f1c58b1d1a14d05796d656bdeb2d20d]]
Former-commit-id: 5bc115c56c
Former-commit-id: a34d7b254f
|
2013-10-29 11:44:48 -05:00 |
|
Ben Steffensmeier
|
32427d8b3d
|
Issue #2489 Fix SfcObs NPE.
Former-commit-id: 59d8afc639 [formerly f9ee49fac5] [formerly ddf506ceac [formerly 3013c7d2bbf38ab9c27491eb3cade83eaafc35aa]]
Former-commit-id: ddf506ceac
Former-commit-id: ca5a125829
|
2013-10-29 10:59:36 -05:00 |
|
Steve Harris
|
3b29cf6790
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: a103a0e8ac [formerly 560b0075cd] [formerly 6ea4ac62ed [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: eced243e6a
|
2013-10-28 15:58:12 -05:00 |
|
Bryan Kowal
|
27d2e33769
|
Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install.
Former-commit-id: df575b7be1 [formerly a6d7822698] [formerly cda8d04831 [formerly 06a166ef6c963585eb65da223610a21665f9545a]]
Former-commit-id: cda8d04831
Former-commit-id: cc0f6832c9
|
2013-10-28 14:50:28 -05:00 |
|
Nate Jensen
|
9dc4378fc4
|
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: 4cd0b3fed7 [formerly ac65672cb2] [formerly f62f7dc851 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]
Former-commit-id: f62f7dc851
Former-commit-id: 87917f3548
|
2013-10-28 13:27:17 -05:00 |
|
Ben Steffensmeier
|
54a39977f5
|
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 4e86bb8e5f [formerly 65522e83c9] [formerly 5b439696df [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]
Former-commit-id: 5b439696df
Former-commit-id: 6866344496
|
2013-10-28 13:16:23 -05:00 |
|
Ron Anderson
|
3575496955
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: dd3ef2844c [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]
Former-commit-id: f2cfc0c686
Former-commit-id: dda2eb89c1
|
2013-10-28 12:59:44 -05:00 |
|
Steve Harris
|
3b738baba8
|
14.1.1-5 baseline
Former-commit-id: 933e7395ac [formerly 877776a04c] [formerly f4c53b02fa [formerly b643d85f65fe0393024cf43473fd567d8b7b2b65]]
Former-commit-id: f4c53b02fa
Former-commit-id: af2707389c
|
2013-10-28 12:14:27 -04:00 |
|
Ben Steffensmeier
|
0e3cf8b47f
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: 0c66089721 [formerly 27165cea30] [formerly 44a6f05986 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]
Former-commit-id: 44a6f05986
Former-commit-id: 1f33a1997e
|
2013-10-28 10:14:08 -05:00 |
|
Steve Harris
|
b60635cd70
|
14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]
Former-commit-id: 99e3707c5b
Former-commit-id: 7590a56e0e
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
aa59400b67
|
14.1.1-3 baseline
Former-commit-id: 851f9df229 [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]
Former-commit-id: 5739b4f832
Former-commit-id: 4a6a209aea
|
2013-10-28 10:46:02 -04:00 |
|
Nate Jensen
|
4938d287fe
|
Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: b8d194e4cd [formerly ca2e057635] [formerly cda57ce742 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]
Former-commit-id: cda57ce742
Former-commit-id: fad56e0c5f
|
2013-10-28 09:31:28 -05:00 |
|
Nate Jensen
|
3d10b22fe1
|
Issue #2359 fix for extra long messages
Former-commit-id: e7763c0864 [formerly 665e224c75] [formerly 3abe5b9f18 [formerly 0abed910739dc824b174c8de5c4b155a1fd91803]]
Former-commit-id: 3abe5b9f18
Former-commit-id: 8ad85c297c
|
2013-10-28 09:15:20 -05:00 |
|
Nate Jensen
|
8aa02150c4
|
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 13eafc05c2 [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]
Former-commit-id: e4aa2b8a94
Former-commit-id: aa0e2ca80a
|
2013-10-28 09:07:04 -05:00 |
|
Nate Jensen
|
e46c285eed
|
Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: f98764cfb6 [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 9d43ad381967fff847f33025461a31bb31816819]]
Former-commit-id: 15fbcd6984
Former-commit-id: 68a8dbe064
|
2013-10-28 09:05:01 -05:00 |
|
Nate Jensen
|
9e64c8d7a2
|
Merge "Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins." into development
Former-commit-id: 8ca435c9e7 [formerly 6dd1198fdf] [formerly 70421fd756 [formerly d4adddcf9b5e860cb4976535a1b2309f8fd47783]]
Former-commit-id: 70421fd756
Former-commit-id: 1ed235de97
|
2013-10-28 09:04:12 -05:00 |
|
Ben Steffensmeier
|
4eea088717
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: 3b68ce8d72 [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]
Former-commit-id: 4c03fc93f1
Former-commit-id: fbdcadb456
|
2013-10-25 15:50:10 -05:00 |
|
Ben Steffensmeier
|
237d947086
|
Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: a629f974a5 [formerly 88ad284e71] [formerly 3150d960e8 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]
Former-commit-id: 3150d960e8
Former-commit-id: 4311d8ea4c
|
2013-10-25 15:42:53 -05:00 |
|
Ben Steffensmeier
|
ce9653ab15
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: f34bfc1e5b [formerly c14cc609a8] [formerly cac1f07cbb [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]
Former-commit-id: cac1f07cbb
Former-commit-id: a06bdc56d6
|
2013-10-25 15:31:39 -05:00 |
|
Ben Steffensmeier
|
8248ea2b3b
|
Issue #2491 fix d2d xy bundles.
Former-commit-id: 9922b11f75 [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ddf45e1cf4
|
2013-10-25 14:46:43 -05:00 |
|
Nate Jensen
|
403ba0f9cb
|
Issue #2361 remove ISerializableObject from harvester plugin
Former-commit-id: 540d0ee576 [formerly 5f457fbad6] [formerly 68150f49ef [formerly f80e24871b5fb2e6f990cc099532adfcb802ae13]]
Former-commit-id: 68150f49ef
Former-commit-id: 2002f94568
|
2013-10-24 20:06:08 -05:00 |
|