Nate Jensen
|
01e92b31e4
|
Issue #2581 fix local storm report delta script and unique constraint
Change-Id: I421aed1572c10c80a592381c849d85eac8d1e809
Former-commit-id: 16d01f1ca7 [formerly 562e85e45b ] [formerly e6feb413f7 ] [formerly 16d01f1ca7 [formerly 562e85e45b ] [formerly e6feb413f7 ] [formerly 059e057cdb [formerly e6feb413f7 [formerly 88918268a6d72d35dd2f19be09fbb429851fe46b]]]]
Former-commit-id: 059e057cdb
Former-commit-id: f58034617d [formerly d4236a7fc0 ] [formerly eb6b4892671bdfa9f3570ac483b6bc6a075ba84b [formerly bc2f099cc6 ]]
Former-commit-id: 20d520612f8768a8f88dbd545ab39da3abd62969 [formerly 47f20fb577 ]
Former-commit-id: 31ce99c9f1
|
2014-01-15 09:50:35 -06:00 |
|
Steve Harris
|
e167208631
|
Issue #2214 - restoring the libjep.so files I clobbered in the omaha_14.1.1 -> development merge
Former-commit-id: ad200adacd [formerly 920e06b8ff ] [formerly c37908caa8 ] [formerly ad200adacd [formerly 920e06b8ff ] [formerly c37908caa8 ] [formerly 39ab54c912 [formerly c37908caa8 [formerly f0792ba7de783225b4c13970dff87bb7b17f4f94]]]]
Former-commit-id: 39ab54c912
Former-commit-id: 69710c8f63 [formerly 7b9bc1ae90 ] [formerly f2b3feeb03238e38bba68b87041e15e6592d811b [formerly 94a60728ca ]]
Former-commit-id: 0dbdb8b56bcd9a174076ebaf21e6fcc45d778e86 [formerly 77d9b628fe ]
Former-commit-id: 99232f6c6c
|
2013-11-19 10:08:45 -06:00 |
|
Steve Harris
|
2d3311aace
|
Merge branch 'omaha_14.1.1' (14.1.1-9) into development
Conflicts:
cots/org.jep.linux32/libjep.so
cots/org.jep.linux64/libjep.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
(took all the omaha_14.1.1 versions)
Former-commit-id: f7878c44cb [formerly 542a0946f2 ] [formerly 0a36987a01 ] [formerly f7878c44cb [formerly 542a0946f2 ] [formerly 0a36987a01 ] [formerly 6d9efac6ef [formerly 0a36987a01 [formerly 42b0235982d6d03e6e14057a1072842fcadc4b85]]]]
Former-commit-id: 6d9efac6ef
Former-commit-id: 3b074763ab [formerly 3f9df61017 ] [formerly 1978596c628755147b84f2d7e363ca602a98cedf [formerly 869b505f80 ]]
Former-commit-id: aff5d0abe267c4419bbecd159b29ef6d6ca51480 [formerly c26818afe6 ]
Former-commit-id: 87ce579deb
|
2013-11-15 13:15:25 -06:00 |
|
Steve Harris
|
e3de9e104e
|
14.1.1-9 baseline
Former-commit-id: ba884f2a27 [formerly a32eadf384 ] [formerly f8f995b697 ] [formerly ba884f2a27 [formerly a32eadf384 ] [formerly f8f995b697 ] [formerly 5a0a40e67c [formerly f8f995b697 [formerly 0d10fff4b09db0e4b0b8bcf7481f5f13af0943f5]]]]
Former-commit-id: 5a0a40e67c
Former-commit-id: 7977f24d77 [formerly eab5bb1147 ] [formerly 1abf0e99cad9d8f5d8540c9724d2144a5aab0211 [formerly 8c136f202d ]]
Former-commit-id: 7d3151fa65482d7fe7a3ae91e52a20bb86097b97 [formerly ea382798b5 ]
Former-commit-id: ed58bc7f71
|
2013-11-15 12:47:49 -05:00 |
|
Bryan Kowal
|
89b9e26156
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 1d519f9778 [formerly 178d95e59d ] [formerly 86dd200844 ] [formerly 1d519f9778 [formerly 178d95e59d ] [formerly 86dd200844 ] [formerly 0544b66f4e [formerly 86dd200844 [formerly 038cc7fd8c8dd54a67183f9c726b3c41d0c4e638]]]]
Former-commit-id: 0544b66f4e
Former-commit-id: ce40d40304 [formerly a2b1211c52 ] [formerly 9fef8ee66c8d7456504fc2bc5dcebeba0b756974 [formerly 01735ca0c4 ]]
Former-commit-id: 52598106710ffd4583947f5428f98b7eb89170c3 [formerly 1a905e8a3c ]
Former-commit-id: 97c0dff26a
|
2013-11-13 13:16:55 -06:00 |
|
Dave Hladky
|
6ee91eff8a
|
Issue #2542 Jetty upgraded
Change-Id: Ib3a3f46656e6f205e968f342b7034ab961d35cf3
Former-commit-id: 80ce7ec3e7 [formerly 5313c8b68d ] [formerly 643a150777 ] [formerly 80ce7ec3e7 [formerly 5313c8b68d ] [formerly 643a150777 ] [formerly e3a259182c [formerly 643a150777 [formerly 8de606bc467ba4d567bc2825f2aa10211774ff7d]]]]
Former-commit-id: e3a259182c
Former-commit-id: b467763805 [formerly f2f670bc00 ] [formerly a4fec8aeeb03e65d82a83a1808e0fa6530ced21e [formerly 53866e481a ]]
Former-commit-id: 454826e2ebc64df06b520cf75175b5fe9f328956 [formerly 86363574b3 ]
Former-commit-id: fa2238778d
|
2013-11-12 14:55:41 -06:00 |
|
Richard Peter
|
ff729f46b5
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
rpms/awips2.core/Installer.httpd-pypies/component.spec
rpms/build/i386/build.sh
rpms/build/i386/build.sh-keep-10032013
rpms/build/i386/build.sh-keep-11012013
rpms/build/x86_64/build.sh
rpms/build/x86_64/build.sh.orig
Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461
Former-commit-id: 061fa07147 [formerly 7ba466f5a6 ] [formerly 306bd6fae1 ] [formerly 061fa07147 [formerly 7ba466f5a6 ] [formerly 306bd6fae1 ] [formerly 460a7b8b5d [formerly 306bd6fae1 [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 112816a54c [formerly 3f68fc6eed ] [formerly 617c9d2d122683ab3ac05ff74694962b33afa16d [formerly 59671c1e7d ]]
Former-commit-id: 8b93a7813019963981a150f64ec44daf5d188cde [formerly c8ef435295 ]
Former-commit-id: ef23a8f65b
|
2013-11-12 11:11:36 -06:00 |
|
Brian Clements
|
01b43748e3
|
Issue #2515 upgraded camel from 2.11.0 to 2.11.2
removed log showBody workaround
Former-commit-id: b21233ec65 [formerly 6f0630aa55 ] [formerly 4f374688c8 ] [formerly b21233ec65 [formerly 6f0630aa55 ] [formerly 4f374688c8 ] [formerly ea6b162369 [formerly 4f374688c8 [formerly afee27c0b6b574b7d664f47ca0f9369f2b920426]]]]
Former-commit-id: ea6b162369
Former-commit-id: 8feab3c298 [formerly 83edfb5349 ] [formerly 82443edd368b60c7bbdfdc3a561f8cc96b1eb818 [formerly a5b61b6d22 ]]
Former-commit-id: b12cec907353dc39ab55060375f514735f428cb0 [formerly 6772e50e80 ]
Former-commit-id: 1369b5d57a
|
2013-11-07 16:56:25 -06:00 |
|
Steve Harris
|
2608595d90
|
14.1.1-7 baseline
Former-commit-id: 21ff310620 [formerly 80614c0e52 ] [formerly 3328e2dd1d ] [formerly 21ff310620 [formerly 80614c0e52 ] [formerly 3328e2dd1d ] [formerly 4fff87723f [formerly 3328e2dd1d [formerly 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998]]]]
Former-commit-id: 4fff87723f
Former-commit-id: 4d2f53ebc6 [formerly b694612fe0 ] [formerly d44a91d984ae1d600e17c54655b8255108cade35 [formerly 48df058653 ]]
Former-commit-id: 39afc27726ae906146c56faa8073b17caaeb711d [formerly 647b908fed ]
Former-commit-id: cfb3194426
|
2013-11-06 14:16:14 -05:00 |
|
Steve Harris
|
77ce162114
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 354a736ed5 [formerly 1a9ff8df10 ] [formerly 2e0db025f3 ] [formerly 354a736ed5 [formerly 1a9ff8df10 ] [formerly 2e0db025f3 ] [formerly a956fd7f4d [formerly 2e0db025f3 [formerly 1e8e1f73bdbb02ee2f8c91d4a2128ea0d77cf084]]]]
Former-commit-id: a956fd7f4d
Former-commit-id: 89bf1adcf5 [formerly 02907147b6 ] [formerly ab6310aa243dfb8185d05a0491fd0532879e343a [formerly 6d20cd89ff ]]
Former-commit-id: 606add2f1c8ffb454a9b5974ada8971cbce12c65 [formerly 999fd5433c ]
Former-commit-id: 280de5fb9e
|
2013-11-04 20:29:07 -06:00 |
|
Dave Hladky
|
02a0a1170c
|
Issue #2472 Replacing lost commit
Former-commit-id: a6182c2af0 [formerly 62d08dbe93 ] [formerly 1f1469fe82 ] [formerly a6182c2af0 [formerly 62d08dbe93 ] [formerly 1f1469fe82 ] [formerly 9c6a430d40 [formerly 1f1469fe82 [formerly 7c1f7ad737361b55e85bdf48dad24c7a60b36e99]]]]
Former-commit-id: 9c6a430d40
Former-commit-id: aaa709a11d [formerly 2a2b35d62c ] [formerly 5ba22e77f9a88fb32b78daae0e95bb5adceda6ea [formerly 47b946fc3b ]]
Former-commit-id: ded942728a3b08cb39f24160cce93702bdc3e92e [formerly d5a1042ba3 ]
Former-commit-id: 5eefed071f
|
2013-11-04 16:24:14 -06:00 |
|
Bryan Kowal
|
fde1c7e23f
|
Issue #2476 - re-compile jep for RHEL6 64-bit
Former-commit-id: 4a22b3ce5f [formerly fc05fd7140 ] [formerly 5b99b99d3c ] [formerly 4a22b3ce5f [formerly fc05fd7140 ] [formerly 5b99b99d3c ] [formerly d034d82744 [formerly 5b99b99d3c [formerly 39a2c09fe71d3fbafa1a10dc08e7348f7710579c]]]]
Former-commit-id: d034d82744
Former-commit-id: ea5b64b722 [formerly bde48968ca ] [formerly 5af137f626136247835c40325feecbdfe2991c62 [formerly 7e94e4cd78 ]]
Former-commit-id: 208a3b4fc0e99b4f630a6b5853a5b910b30552a1 [formerly 4006fd8f54 ]
Former-commit-id: 9bf7652dbd
|
2013-10-31 15:56:34 -05:00 |
|
Bryan Kowal
|
7cd17382dc
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Former-commit-id: fd5a5096de [formerly 04bcd7e6dc ] [formerly 49422aea62 ] [formerly fd5a5096de [formerly 04bcd7e6dc ] [formerly 49422aea62 ] [formerly d08a652e23 [formerly 49422aea62 [formerly ecb1c0da101c986ef21bb8514660605926303a71]]]]
Former-commit-id: d08a652e23
Former-commit-id: 874bd8aa36 [formerly d53ec9c750 ] [formerly 2f7241bd44af27a962760419963b91198396fa99 [formerly adb62df96a ]]
Former-commit-id: 7bb259e517c1ed9b9182d1d9842aa0cc9ad29f26 [formerly 70d4374ce8 ]
Former-commit-id: 0d8ab84604
|
2013-10-31 15:43:29 -05:00 |
|
Bryan Kowal
|
6a0ddf11e4
|
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: 5164a7c0b1 [formerly 38464427d3 ] [formerly feaacd9356 ] [formerly 5164a7c0b1 [formerly 38464427d3 ] [formerly feaacd9356 ] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b ] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934 ]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c ]
Former-commit-id: f5bb76a01e
|
2013-10-31 15:34:46 -05:00 |
|
Bryan Kowal
|
a89b081ba5
|
Issue #2476 - recompile jep for RHEL5 32-bit, RHEL5 64-bit, and Windows 32-bit
Former-commit-id: 60904307b5 [formerly ecda7100be ] [formerly c74123f5a8 ] [formerly 60904307b5 [formerly ecda7100be ] [formerly c74123f5a8 ] [formerly e9b76cf185 [formerly c74123f5a8 [formerly be179f2809180da7812a9f4b53b48870b13191ae]]]]
Former-commit-id: e9b76cf185
Former-commit-id: df0ae3ba94 [formerly 02cdbe0173 ] [formerly 9902031682720d70e9b58e2fde57c57da41262d1 [formerly d08a1af457 ]]
Former-commit-id: 2287564d3c4d6587a1fef7d747e5c4b647a3d562 [formerly 71b5ef4733 ]
Former-commit-id: 44d773b663
|
2013-10-31 14:53:27 -05:00 |
|
Greg Armendariz
|
a7d7c6447f
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 795d6cf541 [formerly 0daf07742e ] [formerly f6d98d6317 ] [formerly 795d6cf541 [formerly 0daf07742e ] [formerly f6d98d6317 ] [formerly 64dd62005b [formerly f6d98d6317 [formerly e1969dc2abafe372c0e9a874f464fc5336efd119]]]]
Former-commit-id: 64dd62005b
Former-commit-id: 83262b6cc4 [formerly 5cf091c499 ] [formerly 3a7bea98c42e7d77a7480bbc262fa233cb1f6a6b [formerly 4fb0e0bd2f ]]
Former-commit-id: cc39f166545faa38560a0e3c8a7dafc13408d077 [formerly eefcbf7dcb ]
Former-commit-id: c846280439
|
2013-10-30 14:52:16 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
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: a18df07586 [formerly 554a9cddf3 ] [formerly f3143ba7b4 ] [formerly a18df07586 [formerly 554a9cddf3 ] [formerly f3143ba7b4 ] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa ] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e ]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108 ]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Steve Harris
|
ba80e5f206
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: f25d638bc2 [formerly a103a0e8ac ] [formerly 560b0075cd ] [formerly f25d638bc2 [formerly a103a0e8ac ] [formerly 560b0075cd ] [formerly 6ea4ac62ed [formerly 560b0075cd [formerly 44ca28a7f980977bec5834069cdaf6e18fc224e8]]]]
Former-commit-id: 6ea4ac62ed
Former-commit-id: 0be97d503a [formerly 3b29cf6790 ] [formerly c51eafcb852c1a8282b6694b8e25e7101b5a76bb [formerly eced243e6a ]]
Former-commit-id: 23f5786872767a023465fd464ca03603e3e984fb [formerly 75cdf331b6 ]
Former-commit-id: 8982d892ba
|
2013-10-28 15:58:12 -05:00 |
|
Steve Harris
|
cbf859daf6
|
14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a ] [formerly bd95bb6a4e ] [formerly cb3b53f205 [formerly 82dec19b6a ] [formerly bd95bb6a4e ] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70 ] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e ]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42 ]
Former-commit-id: da4589ec2b
|
2013-10-28 10:55:16 -04:00 |
|
Steve Harris
|
c784003711
|
14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229 ] [formerly 94f24e0d8a ] [formerly a0ba2e1252 [formerly 851f9df229 ] [formerly 94f24e0d8a ] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67 ] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea ]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4 ]
Former-commit-id: 472c0a1a5e
|
2013-10-28 10:46:02 -04:00 |
|
Nate Jensen
|
e95a9d9144
|
Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442 ] [formerly 002005139f ] [formerly 2c88b7d9b3 [formerly 3a453d5442 ] [formerly 002005139f ] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1 ] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257 ]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba ]
Former-commit-id: 213478f84b
|
2013-10-24 20:02:18 -05:00 |
|
Ben Steffensmeier
|
a14d315ae5
|
Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b
Former-commit-id: f98448d19f [formerly a935ffadf7 ] [formerly bfc3faf08f ] [formerly f98448d19f [formerly a935ffadf7 ] [formerly bfc3faf08f ] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3b4ae67ded [formerly 09a3276d51 ] [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7 ]]
Former-commit-id: af4e8832b224839d1a54437070e9f5572038a410 [formerly 5971562d1a ]
Former-commit-id: d1d057ae57
|
2013-10-24 11:28:06 -05:00 |
|
Bryan Kowal
|
61c9dae45c
|
Issue #2476 - re-compile 64-bit jep for RHEL6
Former-commit-id: d67bbce7f3 [formerly 069cb9645e ] [formerly 4c3cdbb28e ] [formerly d67bbce7f3 [formerly 069cb9645e ] [formerly 4c3cdbb28e ] [formerly 8036733372 [formerly 4c3cdbb28e [formerly f4fc8fb61073ffd0ed88e9ac5520d9b538481516]]]]
Former-commit-id: 8036733372
Former-commit-id: b17ec4bf91 [formerly 43f23dbc5f ] [formerly 6cd578ca9adeb4f26edf6048fb0bcfdd512f81a2 [formerly 4bb993d6c3 ]]
Former-commit-id: 2ce7335dcd7a35775f7d91f9840dae3d021feaae [formerly b3a3b98654 ]
Former-commit-id: 25c863d914
|
2013-10-23 17:12:02 -05:00 |
|
Richard Peter
|
0a7c1f2fd7
|
Merge branch 'development' into development_on_RHEL6
Conflicts:
cots/org.jep.linux64/libjep.so
Change-Id: Ib01663f1b3be2671b90a35af2fcfc73cc6b0635d
Former-commit-id: 9b5d2fa69f [formerly f69bbf7952 ] [formerly cb33f5ada7 ] [formerly 9b5d2fa69f [formerly f69bbf7952 ] [formerly cb33f5ada7 ] [formerly 14d5b8656e [formerly cb33f5ada7 [formerly 81a1af882e3fa8703e3b4b6bb687a1ab9710b386]]]]
Former-commit-id: 14d5b8656e
Former-commit-id: b29e037e05 [formerly a49c67203e ] [formerly e43a9bab4c68a481f2c9959d56447b4b556d21ba [formerly 6ecb80e892 ]]
Former-commit-id: eeadb56d97d16e80b358cd1042a03be4d25aa4bb [formerly e27a298e62 ]
Former-commit-id: 9b381e593d
|
2013-10-23 15:50:25 -05:00 |
|
Bryan Kowal
|
97ffa8829a
|
Issue #2476 - recompiled Jep for Windows
Former-commit-id: 554b8ed515 [formerly 243ffb4b93 ] [formerly 0e1c5b51ba ] [formerly 554b8ed515 [formerly 243ffb4b93 ] [formerly 0e1c5b51ba ] [formerly 79f2f2694f [formerly 0e1c5b51ba [formerly 408bf5a265f558f22d86295e2c541166868d8d1b]]]]
Former-commit-id: 79f2f2694f
Former-commit-id: 18a835700a [formerly 752061e05f ] [formerly 58afb6492c43f13934558f37ad7c83bc33ab527c [formerly 1737a11d53 ]]
Former-commit-id: 833e74b1f5f48f42e650592487403ab30c677398 [formerly 214f089bfb ]
Former-commit-id: 55f25948a4
|
2013-10-23 15:12:42 -05:00 |
|
Bryan Kowal
|
7edf3a45ff
|
Issue #2476 - recompiled jep for Linux
Former-commit-id: 3cecffdc41 [formerly 701b9de382 ] [formerly a3cfae3510 ] [formerly 3cecffdc41 [formerly 701b9de382 ] [formerly a3cfae3510 ] [formerly 9fe5429068 [formerly a3cfae3510 [formerly b33a29abbb89d392b7bba2862db4b3d06b2c24a5]]]]
Former-commit-id: 9fe5429068
Former-commit-id: 3bd099e334 [formerly 855abcd044 ] [formerly 9f7f22be22f7dce0a7d746d3dcc5083e9a47ffea [formerly 46f5db6284 ]]
Former-commit-id: 9e486c49d43fefe956fbdfac89e423247921b42a [formerly 12e7425440 ]
Former-commit-id: b1d11306ae
|
2013-10-23 15:12:42 -05:00 |
|
Bryan Kowal
|
08fcd810c5
|
Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49dd7daf05 [formerly 3f4263fa07 ] [formerly a929dec887 ] [formerly 49dd7daf05 [formerly 3f4263fa07 ] [formerly a929dec887 ] [formerly c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]]
Former-commit-id: c13018301e
Former-commit-id: 07b0c95cb8 [formerly f731c424bb ] [formerly 01f5de1dacc767ea28030a4861c52d252dbd57ba [formerly 0a06af1fdd ]]
Former-commit-id: b86c85fd3da49ecc68392ee5a3b1ab792326e1f0 [formerly c846630ac7 ]
Former-commit-id: 5a8bfe3756
|
2013-10-14 17:58:22 -05:00 |
|
Nate Jensen
|
239711078f
|
Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e
Former-commit-id: 2fb28dce46 [formerly d7e4576380 ] [formerly b49a2ceb2f ] [formerly 2fb28dce46 [formerly d7e4576380 ] [formerly b49a2ceb2f ] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]]
Former-commit-id: 40847d0edf
Former-commit-id: 9d1df167be [formerly d84f47b609 ] [formerly 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1 ]]
Former-commit-id: c8ae0a88008c418e7419cfb8e0c8c5886ca02adc [formerly b506ef6a8d ]
Former-commit-id: bae5313482
|
2013-10-14 15:30:09 -05:00 |
|
Bryan Kowal
|
87750ddaef
|
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 3b7573154c [formerly bb5acf7c11 ] [formerly c125b5b053 ] [formerly 3b7573154c [formerly bb5acf7c11 ] [formerly c125b5b053 ] [formerly 9829477ced [formerly c125b5b053 [formerly 97612cb78e067c493f7b5a76a2a84d88c96a5094]]]]
Former-commit-id: 9829477ced
Former-commit-id: f7009e8d15 [formerly 0f825df590 ] [formerly c64333277c4eb7175b863b7b0e456d69b1ec8730 [formerly ef789bf912 ]]
Former-commit-id: 4b8c9fd4d50ca4bb221c690f2c6e35cfe5c34531 [formerly 0efd4c7c50 ]
Former-commit-id: 7bd9ea3d30
|
2013-09-30 18:00:31 -05:00 |
|
Dave Hladky
|
f80a730a58
|
Issue #2388 Multiple code jars in path, Nate's logger finds.
Former-commit-id: e8234c2ef8 [formerly 3787da81a8 ] [formerly 8e5d3d9742 ] [formerly e8234c2ef8 [formerly 3787da81a8 ] [formerly 8e5d3d9742 ] [formerly f184d2ba9c [formerly 8e5d3d9742 [formerly ad02f4640d747328257f9b7a3f2ca2300fcc7bba]]]]
Former-commit-id: f184d2ba9c
Former-commit-id: 4df5cea860 [formerly 4360a23a07 ] [formerly e5b737dd2d117f50e8ddc1d9fef058bc6c2b1649 [formerly 41ba230de0 ]]
Former-commit-id: 85d61f4cf30487354033294aee585d0c19887a96 [formerly b98d037cdd ]
Former-commit-id: 5001c8f42e
|
2013-09-19 10:59:07 -05:00 |
|
Dave Hladky
|
8d482914c3
|
Issue #2340 Update path for xmlschema jar
Former-commit-id: f54fc05964 [formerly 9db93af5a4 ] [formerly f83ed6037c ] [formerly f54fc05964 [formerly 9db93af5a4 ] [formerly f83ed6037c ] [formerly 687bd183ee [formerly f83ed6037c [formerly 2336dbc99ba0effc1571672f5ab29fbde4f47863]]]]
Former-commit-id: 687bd183ee
Former-commit-id: 67963a287a [formerly c90333b16f ] [formerly fed6a3e5edd854d22dfed390927c05ae87d484c3 [formerly 1694178dcd ]]
Former-commit-id: 672cebca8808fc98d26731151ee2f13389b0b664 [formerly c64fc6fb5b ]
Former-commit-id: 10bf08a173
|
2013-09-06 09:03:19 -05:00 |
|
Dave Hladky
|
08c120e096
|
Issue #2323 Update xmlschema packages to correct naming convention
Former-commit-id: f57218a173 [formerly b3486515c0 ] [formerly 074f08c4cb ] [formerly f57218a173 [formerly b3486515c0 ] [formerly 074f08c4cb ] [formerly ccff3e3a54 [formerly 074f08c4cb [formerly 884684895e7f7f671e5efe4ea62222bfa3192900]]]]
Former-commit-id: ccff3e3a54
Former-commit-id: 7c718668f8 [formerly e728270388 ] [formerly be4cb956ddb1e2f374655ecbd886e8534f4e15fb [formerly 6a71524ce4 ]]
Former-commit-id: b80b5e234e607c3d64ef6631184c2a3a410223b9 [formerly 0a2c72f57c ]
Former-commit-id: aeb7d62901
|
2013-09-04 12:56:10 -05:00 |
|
Benjamin Phillippe
|
11011350c2
|
Issue #1538 Federated registry fixes/modifications
Change-Id: Iedc048fe42687bec17385f0aacf0af0141df2146
Former-commit-id: 2b6aca163f [formerly 178e073cf3 ] [formerly a96764e900 ] [formerly 2b6aca163f [formerly 178e073cf3 ] [formerly a96764e900 ] [formerly b10ecfa19c [formerly a96764e900 [formerly 05e0a84c1ef3d04256884b81219f643e8f38187d]]]]
Former-commit-id: b10ecfa19c
Former-commit-id: 4e0dc57681 [formerly 117374dbef ] [formerly e00dac430e9e5ef681cf84ca23ae6d1f181901e0 [formerly 283326197a ]]
Former-commit-id: aa9a2dc27e2a7dada329b6c19d2594489eb713f8 [formerly 4634cadd3d ]
Former-commit-id: a9f7a0b874
|
2013-08-28 11:41:06 -05:00 |
|
Richard Peter
|
283db1405c
|
Merge "Issue #2097 Initial update for OGC services Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99" into development
Former-commit-id: b41733e62f [formerly 9ce57ca237 ] [formerly 7883b7642f ] [formerly b41733e62f [formerly 9ce57ca237 ] [formerly 7883b7642f ] [formerly 34a6082255 [formerly 7883b7642f [formerly 96d335d72286bba82f9054b525f47450854797d1]]]]
Former-commit-id: 34a6082255
Former-commit-id: 8d6dd19565 [formerly b418109df7 ] [formerly e464ad97e5c451c923d9238fd91a98fb859d7428 [formerly f9a1a40bc2 ]]
Former-commit-id: e72b3502f415cfb00a578a58639d3810cabf2a7a [formerly a8ee4a3e99 ]
Former-commit-id: 1e6aa9bdeb
|
2013-08-28 08:26:51 -05:00 |
|
Dave Hladky
|
e9c403615e
|
Issue #2097 Initial update for OGC services
Change-Id: I1bc8fc8a4c125bc79057c4af929c0495f0e5eb99
Former-commit-id: d4407744c2 [formerly d3bae9e065 ] [formerly 83dba7b655 ] [formerly d4407744c2 [formerly d3bae9e065 ] [formerly 83dba7b655 ] [formerly bef4b3cdbd [formerly 83dba7b655 [formerly 875006e24de0755cdd0dedc7b0afcf221bcbad49]]]]
Former-commit-id: bef4b3cdbd
Former-commit-id: cfbbc7336f [formerly 6a1a06e3ee ] [formerly e08c7ddce03a7cbe60a4ac8ba5e3f76990cd7780 [formerly 37062aac21 ]]
Former-commit-id: 5748dbd8d6839840ad99d4c5bb21eef11054fe88 [formerly 30aa0c93a1 ]
Former-commit-id: 6e302d35d8
|
2013-08-28 08:24:45 -05:00 |
|
Roger Ferrel
|
66bf045664
|
Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b
Former-commit-id: f418ef2cda [formerly b606e2b075 ] [formerly d4eeceb020 ] [formerly f418ef2cda [formerly b606e2b075 ] [formerly d4eeceb020 ] [formerly 477719a069 [formerly d4eeceb020 [formerly 3456f395e845457b1add41ca8d736a65b6fbb1c7]]]]
Former-commit-id: 477719a069
Former-commit-id: 3010d629f6 [formerly 65633833a8 ] [formerly 736660553836aebddc3fa93490dc0f5c2e086947 [formerly 9025cd3e30 ]]
Former-commit-id: 123bd8416b72def5fe28607cacfd549c162de7af [formerly 47b5b7c876 ]
Former-commit-id: 38c3fe5544
|
2013-08-27 16:51:06 -05:00 |
|
Bryan Kowal
|
d75fd1d5ec
|
Issue #2163 - fixed awips2-openfire and re-compiled nativeLib for RHEL6.
Conflicts:
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.empty.motif.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
Former-commit-id: 31ee9b4bdc [formerly a962be9a15 ] [formerly 0b4961e9b0 ] [formerly 31ee9b4bdc [formerly a962be9a15 ] [formerly 0b4961e9b0 ] [formerly 8b51e353f1 [formerly 0b4961e9b0 [formerly 0a735f5fe81d5329bc02a421ecc39a0974d48d37]]]]
Former-commit-id: 8b51e353f1
Former-commit-id: 5ccd628305 [formerly 9943f3a57c ] [formerly b7034f9b0272242db414c96f4e37cd005d0e39a8 [formerly 5dffc9321c ]]
Former-commit-id: 96167e3734f02c78a86ef1c1abf9b19316a64ba9 [formerly 9af6b44727 ]
Former-commit-id: 9f506d7ce6
|
2013-08-15 15:38:11 -05:00 |
|
Nate Jensen
|
5d607d3cbf
|
Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4
Former-commit-id: 0aab8a628a [formerly 8968389383 ] [formerly ec01e6e872 ] [formerly 0aab8a628a [formerly 8968389383 ] [formerly ec01e6e872 ] [formerly be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]]
Former-commit-id: be9315642b
Former-commit-id: de5ac0756a [formerly 8cca3c32ac ] [formerly 71058eb3f64680175103324660052217c65f2678 [formerly b0f3d536e4 ]]
Former-commit-id: b4837d2813879922805a2c09fd2460bdd91130d5 [formerly 9d4e00d5d1 ]
Former-commit-id: d6cbe9b4f5
|
2013-08-07 16:44:30 -05:00 |
|
Benjamin Phillippe
|
77555b3be3
|
Issue #1693 Modified Submit objects to conform to 4.0 spec. Added remote object references and some cleanup
Change-Id: I0f4eafb3fa68f2d1eeade4f047c95d714502cf56
Former-commit-id: 065a80e21f [formerly 01466d0624 ] [formerly 73fd5ac852 ] [formerly 065a80e21f [formerly 01466d0624 ] [formerly 73fd5ac852 ] [formerly 5bd0d92363 [formerly 73fd5ac852 [formerly 2aa7bdc1a8a942eaa0589527e8987b6fc518479f]]]]
Former-commit-id: 5bd0d92363
Former-commit-id: a3b8e6ff24 [formerly 972d02114c ] [formerly 797d497319dc73d802f575a9b6766863f551e648 [formerly 33f601b72e ]]
Former-commit-id: ce480842c7a3a86dbe46e1d77d9978edd21f2a03 [formerly ce5cb744d8 ]
Former-commit-id: 70887ec713
|
2013-08-06 11:13:01 -05:00 |
|
Nate Jensen
|
07e32f95f7
|
Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b
Former-commit-id: b429fdd192 [formerly fd14405886 ] [formerly 185296c67d ] [formerly b429fdd192 [formerly fd14405886 ] [formerly 185296c67d ] [formerly 4ccfc5be82 [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]]]
Former-commit-id: 4ccfc5be82
Former-commit-id: 1f3f5ace25 [formerly 93976753df ] [formerly 732c085e88be485c5665de3436f4d63820939a50 [formerly a3fd5fa3ee ]]
Former-commit-id: 22483908ee1d82807ddfff8307bf138123ebbb9d [formerly 2e5b04450e ]
Former-commit-id: ed3a464cdf
|
2013-07-25 16:48:18 -05:00 |
|
Nate Jensen
|
ebc078d294
|
Issue #2215 finish removing old facebook thrift
Change-Id: I32423b0f7d0b59cb439fcefcc9b5482947a8a4b1
Former-commit-id: fe77ac028d [formerly b22a1302e9 ] [formerly d6efde8ce2 ] [formerly fe77ac028d [formerly b22a1302e9 ] [formerly d6efde8ce2 ] [formerly a859d20865 [formerly d6efde8ce2 [formerly 66924bc597e0e6da2e5f28b10a40fca10d697fbd]]]]
Former-commit-id: a859d20865
Former-commit-id: 51ebc7cbce [formerly 3bff1bfbad ] [formerly 3cf4ef02f8041c3ce9b6edba8975b7a332c3cd64 [formerly 1feaa09ccf ]]
Former-commit-id: 5e34127701fae9d2c2c9fbfbe75110c347ccca4a [formerly e8b685d73d ]
Former-commit-id: 3c7ec48316
|
2013-07-23 14:03:03 -05:00 |
|
Nate Jensen
|
8dd49daed8
|
Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70
Former-commit-id: 8707633263 [formerly 7197e75c15 ] [formerly 7b4938a999 ] [formerly 8707633263 [formerly 7197e75c15 ] [formerly 7b4938a999 ] [formerly 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]]]
Former-commit-id: 8898a6d2ba
Former-commit-id: c869207445 [formerly 7c438bd944 ] [formerly 4fe140d3706a9bb93c749820c213f4a95dd40dbc [formerly 375ad89ac8 ]]
Former-commit-id: 03082558b26f67648b804696198cf0f48e47ed8f [formerly fa24302a76 ]
Former-commit-id: 3aba42df34
|
2013-07-23 12:28:07 -05:00 |
|
Nate Jensen
|
c6b9b2dd7f
|
Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59
Former-commit-id: 8838a7ee75 [formerly c4bc1ef034 ] [formerly a636846295 ] [formerly 8838a7ee75 [formerly c4bc1ef034 ] [formerly a636846295 ] [formerly f28420dac4 [formerly a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]]]
Former-commit-id: f28420dac4
Former-commit-id: d39a175583 [formerly 8b070975aa ] [formerly 222e227b908ca94947a44a0518892d94ce66b436 [formerly 65dbc62b59 ]]
Former-commit-id: 858ba69761701e13b33acad8a218e96e2b1ad8e4 [formerly 428d0c73dc ]
Former-commit-id: 5a0dd6f037
|
2013-07-17 16:30:08 -05:00 |
|
Ben Steffensmeier
|
146c9553f2
|
Issue #2181 Convert geometry types to use hibernate-spatial
Former-commit-id: 117412c096 [formerly e8b22db364 ] [formerly a655380bad ] [formerly 117412c096 [formerly e8b22db364 ] [formerly a655380bad ] [formerly 0bc5aca64b [formerly a655380bad [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]]]]
Former-commit-id: 0bc5aca64b
Former-commit-id: 1138c8e3be [formerly 15a8153547 ] [formerly 0f349ed1c25cf9258c35204b753d35cd4cd64ded [formerly 466b24a577 ]]
Former-commit-id: dd00301f4af38fc68f855987ecbe5d7658d62abd [formerly bd06f84084 ]
Former-commit-id: 9450df2daf
|
2013-07-16 15:50:14 -05:00 |
|
Max Schenkelberg
|
ad32bbd91d
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b [formerly 94fa6f0e30 ] [formerly 63421a4819 ] [formerly cd88054e2b [formerly 94fa6f0e30 ] [formerly 63421a4819 ] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51 ] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e ]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f ]
Former-commit-id: 5ba50b4476
|
2013-07-15 14:26:15 -05:00 |
|
Nate Jensen
|
4f6c84f9bb
|
Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895
Former-commit-id: 338b0ae310 [formerly a4de603bcf ] [formerly 316d6c09c6 ] [formerly 338b0ae310 [formerly a4de603bcf ] [formerly 316d6c09c6 ] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc ] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c ]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519 ]
Former-commit-id: 86b096bc9b
|
2013-07-01 14:41:05 -05:00 |
|
Steve Harris
|
9f5469bc6e
|
13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332 ] [formerly 70e4ff30a6 ] [formerly 2487a8b435 [formerly c56be8a332 ] [formerly 70e4ff30a6 ] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84 ] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357 ]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922 ]
Former-commit-id: c05a6c8b50
|
2013-06-28 09:46:25 -04:00 |
|
Dave Hladky
|
f258e1e91d
|
Issue #2146 Deleted uneeded jars from crawl4j plugin
Change-Id: I52581c7c5ffb085f3cef1b05f7347dcf02bc2a01
Former-commit-id: 9f621ed6f6 [formerly 2eded94be4 ] [formerly d92e039e72 ] [formerly 9f621ed6f6 [formerly 2eded94be4 ] [formerly d92e039e72 ] [formerly d298749486 [formerly d92e039e72 [formerly d16c25b55eb004223430e65a47f844d0ec8fba79]]]]
Former-commit-id: d298749486
Former-commit-id: 07227d8a4d [formerly e8ac45c21f ] [formerly dc3c08fc586f55d74f5997ba1f7d8bdaee7b0ba7 [formerly 00ed2353ad ]]
Former-commit-id: 81a68128096cd1ef98c033c1c936296d96a3888e [formerly ecf2849566 ]
Former-commit-id: 11c6036301
|
2013-06-26 14:59:22 -05:00 |
|
Richard Peter
|
f6e6c3c531
|
Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c
Former-commit-id: cf29af8d65 [formerly ad353c34f9 ] [formerly d262c02612 ] [formerly cf29af8d65 [formerly ad353c34f9 ] [formerly d262c02612 ] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a ] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb ]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f ]
Former-commit-id: ed15c2edcc
|
2013-06-24 18:51:56 -05:00 |
|
Dustin Johnson
|
eb194fb644
|
Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7
Former-commit-id: e8511a53ad [formerly b9d8e444b3 ] [formerly 9bc7c854ab ] [formerly e8511a53ad [formerly b9d8e444b3 ] [formerly 9bc7c854ab ] [formerly 7ee918a548 [formerly 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]]]]
Former-commit-id: 7ee918a548
Former-commit-id: 73e70fe69a [formerly e7a679ebc7 ] [formerly 0bda58a8028b819a68146a811f6632e8d08a2202 [formerly 50cb2e26a2 ]]
Former-commit-id: 3a585d939f08c5550919df20ddfa5031fa2b67c5 [formerly cd12316060 ]
Former-commit-id: b0c2c25598
|
2013-06-18 12:34:25 -05:00 |
|